diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-09-11 08:15:55 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-09-11 08:15:55 +0000 |
| commit | 1a60ab36d9f9ad8a4f1b0db3ebd9c5c2ba758232 (patch) | |
| tree | b560ad12600592a1967a05478c7ccfad18e02c86 /target/linux | |
| parent | 031e6f65ba782237487838291551767682b0e65c (diff) | |
| download | upstream-1a60ab36d9f9ad8a4f1b0db3ebd9c5c2ba758232.tar.gz upstream-1a60ab36d9f9ad8a4f1b0db3ebd9c5c2ba758232.tar.bz2 upstream-1a60ab36d9f9ad8a4f1b0db3ebd9c5c2ba758232.zip | |
kernel: wrong image_cmdline patches has been sent by accidentaly, replace them
SVN-Revision: 17570
Diffstat (limited to 'target/linux')
4 files changed, 0 insertions, 124 deletions
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 cd315a4cfb..da4a1b1bfe 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 59bc6233e9..ec2dfce562 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 75dc2b0682..7433686857 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 6b27264162..026a84b6a4 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 |