diff --git a/lustre/kernel_patches/patches/atomic_add_return-sles9.patch b/lustre/kernel_patches/patches/atomic_add_return-sles9.patch index 26443d15781c742acc46f206eba287de500dd606..3c2555bcecf92a77e9fa790e4e04d39057649ce3 100644 --- a/lustre/kernel_patches/patches/atomic_add_return-sles9.patch +++ b/lustre/kernel_patches/patches/atomic_add_return-sles9.patch @@ -1,7 +1,16 @@ -diff -urp linux-2.6.5-7.283.orig/include/asm-i386/atomic.h linux-2.6.5-7.283/include/asm-i386/atomic.h ---- linux-2.6.5-7.283.orig/include/asm-i386/atomic.h 2004-04-04 06:36:52.000000000 +0300 -+++ linux-2.6.5-7.283/include/asm-i386/atomic.h 2007-05-21 09:40:48.000000000 +0300 -@@ -176,6 +176,47 @@ static __inline__ int atomic_add_negativ +Index: linux-2.6.5-7.283/include/asm-i386/atomic.h +=================================================================== +--- linux-2.6.5-7.283.orig/include/asm-i386/atomic.h ++++ linux-2.6.5-7.283/include/asm-i386/atomic.h +@@ -2,6 +2,7 @@ + #define __ARCH_I386_ATOMIC__ + + #include <linux/config.h> ++#include <linux/bitops.h> + + /* + * Atomic operations that C can't guarantee us. Useful for +@@ -176,6 +177,47 @@ static __inline__ int atomic_add_negativ return c; } @@ -49,10 +58,19 @@ diff -urp linux-2.6.5-7.283.orig/include/asm-i386/atomic.h linux-2.6.5-7.283/inc /* These are x86-specific, used by some header files */ #define atomic_clear_mask(mask, addr) \ __asm__ __volatile__(LOCK "andl %0,%1" \ -diff -urp linux-2.6.5-7.283.orig/include/asm-x86_64/atomic.h linux-2.6.5-7.283/include/asm-x86_64/atomic.h ---- linux-2.6.5-7.283.orig/include/asm-x86_64/atomic.h 2004-04-04 06:38:20.000000000 +0300 -+++ linux-2.6.5-7.283/include/asm-x86_64/atomic.h 2007-05-21 09:47:04.000000000 +0300 -@@ -178,6 +178,31 @@ static __inline__ int atomic_add_negativ +Index: linux-2.6.5-7.283/include/asm-x86_64/atomic.h +=================================================================== +--- linux-2.6.5-7.283.orig/include/asm-x86_64/atomic.h ++++ linux-2.6.5-7.283/include/asm-x86_64/atomic.h +@@ -2,6 +2,7 @@ + #define __ARCH_X86_64_ATOMIC__ + + #include <linux/config.h> ++#include <linux/bitops.h> + + /* atomic_t should be 32 bit signed type */ + +@@ -178,6 +179,31 @@ static __inline__ int atomic_add_negativ return c; }