summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-16 01:56:04 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-16 01:56:04 +0000
commite6a68af9e901df02e28f221dcf7c7d9462a9bd02 (patch)
tree7a8919b2830b1c51b5dfe7742261a08168b118a2 /target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch
parent46da1409881bee5a1b11691d286f773f38374bd9 (diff)
prepare for the transition to linux 2.6.22 - make it possible to override the kernel version in the target makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7644 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch
new file mode 100644
index 000000000..49c85a71e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.22/006-gcc4_inline_fix.patch
@@ -0,0 +1,12 @@
+diff -urN linux-2.6.21.1.old/include/asm-mips/system.h linux-2.6.21.1.dev/include/asm-mips/system.h
+--- linux-2.6.21.1.old/include/asm-mips/system.h 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/include/asm-mips/system.h 2007-05-26 19:26:30.870146040 +0200
+@@ -188,7 +188,7 @@
+ if something tries to do an invalid xchg(). */
+ extern void __xchg_called_with_bad_pointer(void);
+
+-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)
+ {
+ switch (size) {
+ case 4: