[Xen-changelog] Fix upgrade omissions.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID fcbc33a437ecfc7b1753d0cd79b33348a9941de3
# Parent  d2f42c284459b4b29e82e46c32b2f0908a200a74
Fix upgrade omissions.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r d2f42c284459 -r fcbc33a437ec 
linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c Thu Feb 16 
11:30:44 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c Thu Feb 16 
14:10:01 2006
@@ -40,8 +40,8 @@
            (end_pfn > MAX_DMA32_PFN || force_iommu))
               swiotlb = 1;
        if (swiotlb) {
+               printk(KERN_INFO "PCI-DMA: Using software bounce buffering for 
IO (SWIOTLB)\n");
                swiotlb_init();
-               printk(KERN_INFO "PCI-DMA: Using software bounce buffering for 
IO (SWIOTLB)\n");
                dma_ops = &swiotlb_dma_ops;
        }
 #else
diff -r d2f42c284459 -r fcbc33a437ec 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h       Thu Feb 
16 11:30:44 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h       Thu Feb 
16 14:10:01 2006
@@ -555,7 +555,7 @@
 #else
 #define smp_rmb()      rmb()
 #define smp_mb()       mb()
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
+#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #endif
 #define smp_read_barrier_depends()     read_barrier_depends()
 #else
diff -r d2f42c284459 -r fcbc33a437ec 
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h     Thu Feb 
16 11:30:44 2006
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h     Thu Feb 
16 14:10:01 2006
@@ -336,7 +336,7 @@
 #define wmb()  asm volatile("" ::: "memory")
 #endif
 #define read_barrier_depends() do {} while(0)
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
+#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #define set_wmb(var, value) do { var = value; wmb(); } while (0)
 
 #define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } 
while (0)

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