diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-24 22:19:05 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-24 22:19:05 -0400 |
| commit | 5a16eff86dc1194a17c69250492e820d828e3bde (patch) | |
| tree | a0f990ce8682d7108f6fbd7f9d3c90a8d318d9b8 /arch | |
| parent | 2e0f4c7b383063abc274c4a088043383a3735b93 (diff) | |
| parent | 61ec7567db103d537329b0db9a887db570431ff4 (diff) | |
| download | linux-5a16eff86dc1194a17c69250492e820d828e3bde.tar.gz linux-5a16eff86dc1194a17c69250492e820d828e3bde.tar.bz2 linux-5a16eff86dc1194a17c69250492e820d828e3bde.zip | |
Pull bugzilla-1641 into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 8 | ||||
| -rw-r--r-- | arch/x86_64/kernel/io_apic.c | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 4b8a8da4b2e0..e2f4a1c68547 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -754,14 +754,6 @@ static int pirq_entries [MAX_PIRQS]; static int pirqs_enabled; int skip_ioapic_setup; -static int __init ioapic_setup(char *str) -{ - skip_ioapic_setup = 1; - return 1; -} - -__setup("noapic", ioapic_setup); - static int __init ioapic_pirq_setup(char *str) { int i, max; diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index f57f8b901912..966fa1062491 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -397,14 +397,12 @@ static void clear_IO_APIC (void) int skip_ioapic_setup; int ioapic_force; -/* dummy parsing: see setup.c */ - -static int __init disable_ioapic_setup(char *str) +static int __init parse_noapic(char *str) { - skip_ioapic_setup = 1; + disable_ioapic_setup(); return 0; } -early_param("noapic", disable_ioapic_setup); +early_param("noapic", parse_noapic); /* Actually the next is obsolete, but keep it for paranoid reasons -AK */ static int __init disable_timer_pin_setup(char *arg) |