aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexander Nyberg <alexn@telia.com>2005-05-01 08:58:52 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:58:52 -0700
commit429e9c5eeb66fc272c15568849ad0b23689a4a06 (patch)
treec8d999f9b0de1e50c5a76ed30d6c6f235106711c /arch
parent[PATCH] x86-64: Handle empty E820 regions correctly (diff)
downloadlinux-dev-429e9c5eeb66fc272c15568849ad0b23689a4a06.tar.xz
linux-dev-429e9c5eeb66fc272c15568849ad0b23689a4a06.zip
[PATCH] x86_64: saved_command_line overflow fix
This strcpy can run off the end of saved_command_line, and we don't need it any more anyway. Signed-off-by: Alexander Nyberg <alexn@telia.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/head64.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 77df2ccb08f1..0f8c78dcd38c 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -91,9 +91,6 @@ void __init x86_64_start_kernel(char * real_mode_data)
#ifdef CONFIG_SMP
cpu_set(0, cpu_online_map);
#endif
- /* default console: */
- if (!strstr(saved_command_line, "console="))
- strcat(saved_command_line, " console=tty0");
s = strstr(saved_command_line, "earlyprintk=");
if (s != NULL)
setup_early_printk(s);