ia64/xen-unstable

changeset 8863:fcbc33a437ec

Fix upgrade omissions.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Feb 16 14:10:01 2006 +0000 (2006-02-16)
parents d2f42c284459
children c6c739bf254d
files linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c	Thu Feb 16 11:30:44 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c	Thu Feb 16 14:10:01 2006 +0000
     1.3 @@ -40,8 +40,8 @@ void pci_swiotlb_init(void)
     1.4  	    (end_pfn > MAX_DMA32_PFN || force_iommu))
     1.5  	       swiotlb = 1;
     1.6  	if (swiotlb) {
     1.7 +		printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n");
     1.8  		swiotlb_init();
     1.9 -		printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n");
    1.10  		dma_ops = &swiotlb_dma_ops;
    1.11  	}
    1.12  #else
     2.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h	Thu Feb 16 11:30:44 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h	Thu Feb 16 14:10:01 2006 +0000
     2.3 @@ -555,7 +555,7 @@ unsigned long __set_mb_temp;            
     2.4  #else
     2.5  #define smp_rmb()	rmb()
     2.6  #define smp_mb()	mb()
     2.7 -#define set_mb(var, value) do { xchg(&var, value); } while (0)
     2.8 +#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
     2.9  #endif
    2.10  #define smp_read_barrier_depends()	read_barrier_depends()
    2.11  #else
     3.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h	Thu Feb 16 11:30:44 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h	Thu Feb 16 14:10:01 2006 +0000
     3.3 @@ -336,7 +336,7 @@ static inline unsigned long __cmpxchg(vo
     3.4  #define wmb()	asm volatile("" ::: "memory")
     3.5  #endif
     3.6  #define read_barrier_depends()	do {} while(0)
     3.7 -#define set_mb(var, value) do { xchg(&var, value); } while (0)
     3.8 +#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
     3.9  #define set_wmb(var, value) do { var = value; wmb(); } while (0)
    3.10  
    3.11  #define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0)