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 | e7b336cf2153d25bcde5c8ab082ab5224014f42f (patch) | |
| tree | d2ca59b176c7ba9d805cf119993f71ad1b48bc43 /target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch | |
| parent | f699b39f6fa6a4970a7c6e70a78848f06fc71077 (diff) | |
| download | master-187ad058-e7b336cf2153d25bcde5c8ab082ab5224014f42f.tar.gz master-187ad058-e7b336cf2153d25bcde5c8ab082ab5224014f42f.tar.bz2 master-187ad058-e7b336cf2153d25bcde5c8ab082ab5224014f42f.zip | |
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
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch | 31 |
1 files changed, 0 insertions, 31 deletions
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 |