diff options
author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2006-03-31 05:30:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:53 -0500 |
commit | 9b41046cd0ee0a57f849d6e1363f7933e363cca9 (patch) | |
tree | 246820e9493770e071cb92a48e7f72d8b9c90a98 /arch/x86_64/kernel/traps.c | |
parent | 68eef3b4791572ecb70249c7fb145bb3742dd899 (diff) |
[PATCH] Don't pass boot parameters to argv_init[]
The boot cmdline is parsed in parse_early_param() and
parse_args(,unknown_bootoption).
And __setup() is used in obsolete_checksetup().
start_kernel()
-> parse_args()
-> unknown_bootoption()
-> obsolete_checksetup()
If __setup()'s callback (->setup_func()) returns 1 in
obsolete_checksetup(), obsolete_checksetup() thinks a parameter was
handled.
If ->setup_func() returns 0, obsolete_checksetup() tries other
->setup_func(). If all ->setup_func() that matched a parameter returns 0,
a parameter is seted to argv_init[].
Then, when runing /sbin/init or init=app, argv_init[] is passed to the app.
If the app doesn't ignore those arguments, it will warning and exit.
This patch fixes a wrong usage of it, however fixes obvious one only.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/traps.c')
-rw-r--r-- | arch/x86_64/kernel/traps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index edaa9fe654dc..6bda322d3caf 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c | |||
@@ -973,14 +973,14 @@ void __init trap_init(void) | |||
973 | static int __init oops_dummy(char *s) | 973 | static int __init oops_dummy(char *s) |
974 | { | 974 | { |
975 | panic_on_oops = 1; | 975 | panic_on_oops = 1; |
976 | return -1; | 976 | return 1; |
977 | } | 977 | } |
978 | __setup("oops=", oops_dummy); | 978 | __setup("oops=", oops_dummy); |
979 | 979 | ||
980 | static int __init kstack_setup(char *s) | 980 | static int __init kstack_setup(char *s) |
981 | { | 981 | { |
982 | kstack_depth_to_print = simple_strtoul(s,NULL,0); | 982 | kstack_depth_to_print = simple_strtoul(s,NULL,0); |
983 | return 0; | 983 | return 1; |
984 | } | 984 | } |
985 | __setup("kstack=", kstack_setup); | 985 | __setup("kstack=", kstack_setup); |
986 | 986 | ||