[Xen-changelog] [linux-2.6.18-xen] merge with linux-2.6.18-xen.hg

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1181936027 21600
# Node ID a413dd61e7e5e1bba11bab447184cf5e6b43513a
# Parent  e00077e5b9a399ece201cd9c6afe5eae37cac5e7
# Parent  77277f89a8e2203e3478d4cc3600349fcc7c830f
merge with linux-2.6.18-xen.hg
---
 include/xen/interface/io/ring.h    |    2 +-
 include/xen/interface/io/xs_wire.h |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff -r e00077e5b9a3 -r a413dd61e7e5 include/xen/interface/io/ring.h
--- a/include/xen/interface/io/ring.h   Fri Jun 15 12:40:12 2007 -0600
+++ b/include/xen/interface/io/ring.h   Fri Jun 15 13:33:47 2007 -0600
@@ -133,7 +133,7 @@ typedef struct __name##_back_ring __name
 #define SHARED_RING_INIT(_s) do {                                       \
     (_s)->req_prod  = (_s)->rsp_prod  = 0;                              \
     (_s)->req_event = (_s)->rsp_event = 1;                              \
-    memset((_s)->pad, 0, sizeof((_s)->pad));                            \
+    (void)memset((_s)->pad, 0, sizeof((_s)->pad));                      \
 } while(0)
 
 #define FRONT_RING_INIT(_r, _s, __size) do {                            \
diff -r e00077e5b9a3 -r a413dd61e7e5 include/xen/interface/io/xs_wire.h
--- a/include/xen/interface/io/xs_wire.h        Fri Jun 15 12:40:12 2007 -0600
+++ b/include/xen/interface/io/xs_wire.h        Fri Jun 15 13:33:47 2007 -0600
@@ -60,7 +60,11 @@ struct xsd_errors
     const char *errstring;
 };
 #define XSD_ERROR(x) { x, #x }
-static struct xsd_errors xsd_errors[] __attribute__((unused)) = {
+static struct xsd_errors xsd_errors[]
+#if defined(__GNUC__)
+__attribute__((unused))
+#endif
+    = {
     XSD_ERROR(EINVAL),
     XSD_ERROR(EACCES),
     XSD_ERROR(EEXIST),

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