kernel: wrong image_cmdline patches has been sent by accidentaly, replace them
authorGabor Juhos <juhosg@openwrt.org>
Fri, 11 Sep 2009 08:15:55 +0000 (08:15 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Fri, 11 Sep 2009 08:15:55 +0000 (08:15 +0000)
SVN-Revision: 17570

target/linux/generic-2.6/patches-2.6.27/021-mips_image_cmdline_hack.patch
target/linux/generic-2.6/patches-2.6.28/021-mips_image_cmdline_hack.patch
target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch

index cd315a4..da4a1b1 100644 (file)
@@ -1,34 +1,3 @@
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -545,8 +545,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
 @@ -771,6 +771,10 @@ config SYNC_R4K
index 59bc623..ec2dfce 100644 (file)
@@ -1,34 +1,3 @@
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -545,8 +545,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
 @@ -766,6 +766,10 @@ config SYNC_R4K
index 75dc2b0..7433686 100644 (file)
@@ -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
 @@ -806,6 +806,10 @@ config SYNC_R4K
index 6b27264..026a84b 100644 (file)
@@ -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