[Xen-changelog] [linux-2.6.18-xen] xen: re-synchronize ring.h public header

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1254897220 -3600
# Node ID 7d57b5843b6587d2f220db0e43cb20b85de9baf7
# Parent  4ac3e1d6605c2257a14ccb84b7be2bda1e304211
xen: re-synchronize ring.h public header

Patch 20267:e9366bed077e modified the definition of sring in the xen
repo's version of ring.h, but not the version in the linux kernel
repo. That change broke pause/resume/shutdown messages from the
blktap2 kernel module, which (for the time being) relies on pad[0]
being at consistent location in the sring struct.  This patch fixes
this regression by resyncronizing the two the files.

Signed off by: Jake Wires <Jake.Wires@xxxxxxxxxx>
---
 include/xen/interface/io/ring.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 4ac3e1d6605c -r 7d57b5843b65 include/xen/interface/io/ring.h
--- a/include/xen/interface/io/ring.h   Tue Sep 29 11:23:06 2009 +0100
+++ b/include/xen/interface/io/ring.h   Wed Oct 07 07:33:40 2009 +0100
@@ -97,7 +97,8 @@ struct __name##_sring {                 
 struct __name##_sring {                                                 \
     RING_IDX req_prod, req_event;                                       \
     RING_IDX rsp_prod, rsp_event;                                       \
-    uint8_t  pad[48];                                                   \
+    uint8_t  netfront_smartpoll_active;                                 \
+    uint8_t  pad[47];                                                   \
     union __name##_sring_entry ring[1]; /* variable-length */           \
 };                                                                      \
                                                                         \

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