diff options
| author | Andi Kleen | 2006-09-26 10:52:32 +0200 |
|---|---|---|
| committer | Andi Kleen | 2006-09-26 10:52:32 +0200 |
| commit | 2c8c0e6b8d7700a990da8d24eff767f9ca223b96 (patch) | |
| tree | b5477ee2558efff235c483d1619ce892db479d18 /arch/x86_64/kernel/io_apic.c | |
| parent | [PATCH] i386: Replace i386 open-coded cmdline parsing with (diff) | |
| download | kernel-qcow2-linux-2c8c0e6b8d7700a990da8d24eff767f9ca223b96.tar.gz kernel-qcow2-linux-2c8c0e6b8d7700a990da8d24eff767f9ca223b96.tar.xz kernel-qcow2-linux-2c8c0e6b8d7700a990da8d24eff767f9ca223b96.zip | |
[PATCH] Convert x86-64 to early param
Instead of hackish manual parsing
Requires earlier i386 patchkit, but also fixes i386 early_printk again.
I removed some obsolete really early parameters which didn't do anything useful.
Also made a few parameters that needed it early (mostly oops printing setup)
Also removed one panic check that wasn't visible without
early console anyways (the early console is now initialized after that
panic)
This cleans up a lot of code.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/io_apic.c')
| -rw-r--r-- | arch/x86_64/kernel/io_apic.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index a1412042b918..afac3dbb3729 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -48,7 +48,7 @@ int sis_apic_bug; /* not actually supported, dummy for compile */ static int no_timer_check; -int disable_timer_pin_1 __initdata; +static int disable_timer_pin_1 __initdata; int timer_over_8254 __initdata = 0; @@ -253,18 +253,17 @@ int ioapic_force; static int __init disable_ioapic_setup(char *str) { skip_ioapic_setup = 1; - return 1; + return 0; } +early_param("noapic", disable_ioapic_setup); -static int __init enable_ioapic_setup(char *str) +/* Actually the next is obsolete, but keep it for paranoid reasons -AK */ +static int __init disable_timer_pin_setup(char *arg) { - ioapic_force = 1; - skip_ioapic_setup = 0; + disable_timer_pin_1 = 1; return 1; } - -__setup("noapic", disable_ioapic_setup); -__setup("apic", enable_ioapic_setup); +__setup("disable_timer_pin_1", disable_timer_pin_setup); static int __init setup_disable_8254_timer(char *s) { |