locking rework, drop non-napi rx, multiqueue tx, misc cleanups

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

diff --git a/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch
index e95663e..49c85a7 100644 (file)
--- a/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch
@@ -1,6 +1,7 @@
---- linux-2.6.15.1.old/include/asm-mips/system.h       2006-01-28 15:02:54.481032280 +0100
-+++ linux-2.6.15.1.dev/include/asm-mips/system.h       2006-01-28 14:47:51.634285848 +0100
-@@ -273,7 +273,7 @@
+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);
  
     if something tries to do an invalid xchg().  */
  extern void __xchg_called_with_bad_pointer(void);
  


@@ -8,4 +9,4 @@
 +static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
  {
        switch (size) {
 +static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
  {
        switch (size) {

-               case 4:
+       case 4: