From 978a5fb741f4278f4f9296e0973b5fe6aa6dbb96 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 11 Sep 2009 08:15:55 +0000 Subject: kernel: wrong image_cmdline patches has been sent by accidentaly, replace them git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17570 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../021-mips_image_cmdline_hack.patch | 31 ---------------------- .../021-mips_image_cmdline_hack.patch | 31 ---------------------- .../021-mips_image_cmdline_hack.patch | 31 ---------------------- .../021-mips_image_cmdline_hack.patch | 31 ---------------------- 4 files changed, 124 deletions(-) (limited to 'target/linux/generic-2.6') diff --git a/target/linux/generic-2.6/patches-2.6.27/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.27/021-mips_image_cmdline_hack.patch index cd315a4cf..da4a1b1bf 100644 --- a/target/linux/generic-2.6/patches-2.6.27/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic-2.6/patches-2.6.27/021-mips_image_cmdline_hack.patch @@ -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 diff --git a/target/linux/generic-2.6/patches-2.6.28/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.28/021-mips_image_cmdline_hack.patch index 59bc6233e..ec2dfce56 100644 --- a/target/linux/generic-2.6/patches-2.6.28/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic-2.6/patches-2.6.28/021-mips_image_cmdline_hack.patch @@ -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 diff --git a/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch index 75dc2b068..743368685 100644 --- a/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic-2.6/patches-2.6.30/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 @@ -806,6 +806,10 @@ config SYNC_R4K 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 6b2726416..026a84b6a 100644 --- 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 -- cgit v1.2.3