resync 2.6.31 patches

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.31 / 021-mips_image_cmdline_hack.patch

diff --git a/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
index 6b27264162ca08caec06766d6c2db2da73106934..026a84b6a4e3afc27b387055a8e6f2fc5faf3e67 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
@@ -1,34 +1,3 @@
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -546,8 +546,28 @@ static void __init resource_init(void)
-       }
- }
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+static void __init process__image_cmdline(void)
-+{
-+      extern char __image_cmdline[];
-+
-+      if (__image_cmdline[0] == '\0')
-+              return;
-+
-+      if (__image_cmdline[0] == '-') {
-+              strlcpy(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
-+      } else {
-+              strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
-+              strlcat(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
-+      }
-+}
-+#else
-+static void inline process__image_cmdline(void) {}
-+#endif
-+
- void __init setup_arch(char **cmdline_p)
- {
-+      process__image_cmdline();
-       cpu_probe();
-       prom_init();
- 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 @@ -840,6 +840,10 @@ config SYNC_R4K