[kernel] refresh 2.6.32 patches

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.32 / 013-gcc4_inline_fix.patch

diff --git a/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
index 9997ff2..77ab405 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
@@ -1,8 +1,8 @@
 --- a/arch/mips/include/asm/system.h
 +++ b/arch/mips/include/asm/system.h
 --- a/arch/mips/include/asm/system.h
 +++ b/arch/mips/include/asm/system.h

-@@ -197,7 +197,7 @@ extern __u64 __xchg_u64_unsupported_on_3
-    if something tries to do an invalid xchg().  */
- extern void __xchg_called_with_bad_pointer(void);
+@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
+ #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
+ #endif

  
 -static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
 +static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
  
 -static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
 +static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)