disable ipt_quota on linux 2.4 - iptables user space no longer compiles with it

[openwrt.git] / target / linux / adm5120-2.6 / patches / 140-cmdline_hack.patch

diff --git a/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch b/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch
index d72073d..d5edc23 100644 (file)
--- a/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch
+++ b/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch
@@ -1,7 +1,8 @@
-diff -ur linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
---- linux.old/arch/mips/kernel/head.S  2006-12-06 17:30:27.000000000 +0100
-+++ linux.dev/arch/mips/kernel/head.S  2006-12-06 18:34:43.000000000 +0100
-@@ -129,15 +129,20 @@
+Index: linux-2.6.21.1/arch/mips/kernel/head.S
+===================================================================
+--- linux-2.6.21.1.orig/arch/mips/kernel/head.S
++++ linux-2.6.21.1/arch/mips/kernel/head.S
+@@ -129,14 +129,19 @@

  #endif
        .endm
  
  #endif
        .endm
  


@@ -17,34 +18,9 @@ diff -ur linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
 +       * Use as temporary storage for the kernel command line, so that it
 +       * can be updated easily without having to relink the kernel.
         */
 +       * Use as temporary storage for the kernel command line, so that it
 +       * can be updated easily without having to relink the kernel.
         */

--      .fill   0x400

 +       
 +EXPORT(_image_cmdline)
 +      .ascii "CMDLINE:"
 +       
 +EXPORT(_image_cmdline)
 +      .ascii "CMDLINE:"

-+      .fill   0x3ec
+       .align 10

  
  EXPORT(stext)                                 # used for profiling
  
  EXPORT(stext)                                 # used for profiling

- EXPORT(_stext)
-diff -ur linux.old/arch/mips/adm5120/prom.c linux.dev/arch/mips/adm5120/prom.c
---- linux.old/arch/mips/adm5120/prom.c 2006-12-06 17:30:27.000000000 +0100
-+++ linux.dev/arch/mips/adm5120/prom.c 2006-12-06 17:41:40.000000000 +0100
-@@ -100,6 +100,7 @@
- }
- 
- 
-+extern char _image_cmdline;
- /*
-  * initialize the prom module.
-  */
-@@ -112,8 +112,10 @@
-       mips_machtype = adm5120_board.mach_type;
- 
-       /* init command line, register a default kernel command line */
--      strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
-+      char *cmd = &_image_cmdline + 8;
-+      if( strlen(cmd) > 0) strcpy( &(arcs_cmdline[0]), cmd);
-+              else strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
- 
-       /* init memory map */
-       prom_meminit();
- }