WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [linux-2.6.18-xen] Fix build after c/s 1028

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] Fix build after c/s 1028
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 26 Aug 2010 03:31:25 -0700
Delivery-date: Thu, 26 Aug 2010 03:37:35 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1282818445 -3600
# Node ID 9b1adfb8b0b3b37c13f06c0adb8dd17b2a0a077d
# Parent  6f7bda25a4de7a4186d65bc0e8e816b1c3664b71
Fix build after c/s 1028

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 drivers/xen/blktap2/ring.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 6f7bda25a4de -r 9b1adfb8b0b3 drivers/xen/blktap2/ring.c
--- a/drivers/xen/blktap2/ring.c        Thu Aug 26 08:50:42 2010 +0100
+++ b/drivers/xen/blktap2/ring.c        Thu Aug 26 11:27:25 2010 +0100
@@ -360,7 +360,7 @@ blktap_ring_set_message(struct blktap *t
 
        down_read(&tap->tap_sem);
        if (ring->ring.sring)
-               ring->ring.sring->pad[0] = msg;
+               ring->ring.sring->private.tapif_user.msg = msg;
        up_read(&tap->tap_sem);
 }
 
@@ -470,7 +470,7 @@ static unsigned int blktap_ring_poll(str
        struct blktap_ring *ring = &tap->ring;
 
        poll_wait(filp, &ring->poll_wait, wait);
-       if (ring->ring.sring->pad[0] != 0 ||
+       if (ring->ring.sring->private.tapif_user.msg ||
            ring->ring.req_prod_pvt != ring->ring.sring->req_prod) {
                RING_PUSH_REQUESTS(&ring->ring);
                return POLLIN | POLLRDNORM;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [linux-2.6.18-xen] Fix build after c/s 1028, Xen patchbot-linux-2.6.18-xen <=