From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 2 Jul 2010 17:58:28 +0000 (+0100)
Subject: io: make shared ring pad field less enticing for users by adding a __ prefix
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11849
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee310a9ca9a9335b4fbe71d109093831528c78f2;p=xen.git

io: make shared ring pad field less enticing for users by adding a __ prefix

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Daniel Stodden <daniel.stodden@citrix.com>
Cc: Dongxiao Xu <dongxiao.xu@intel.com>
---

diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
index 0c01339722..38b70519a9 100644
--- a/xen/include/public/io/ring.h
+++ b/xen/include/public/io/ring.h
@@ -112,7 +112,7 @@ struct __name##_sring {                                                 \
         } tapif_user;                                                   \
         uint8_t pvt_pad[4];                                             \
     } private;                                                          \
-    uint8_t pad[44];                                                    \
+    uint8_t __pad[44];                                                  \
     union __name##_sring_entry ring[1]; /* variable-length */           \
 };                                                                      \
                                                                         \
@@ -156,7 +156,8 @@ typedef struct __name##_back_ring __name##_back_ring_t
 #define SHARED_RING_INIT(_s) do {                                       \
     (_s)->req_prod  = (_s)->rsp_prod  = 0;                              \
     (_s)->req_event = (_s)->rsp_event = 1;                              \
-    (void)memset((_s)->pad, 0, sizeof((_s)->pad));                      \
+    (void)memset((_s)->private.pvt_pad, 0, sizeof((_s)->private.pvt_pad)); \
+    (void)memset((_s)->__pad, 0, sizeof((_s)->__pad));                  \
 } while(0)
 
 #define FRONT_RING_INIT(_r, _s, __size) do {                            \