diff options
author | Len Brown <len.brown@intel.com> | 2007-08-16 03:34:22 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-21 00:33:35 -0400 |
commit | 61ec7567db103d537329b0db9a887db570431ff4 (patch) | |
tree | 7287eb4bd00c09434fc2dd0babadfd0eb7ddc832 /arch/i386/kernel/io_apic.c | |
parent | 28e8351ac22de25034e048c680014ad824323c65 (diff) | |
download | op-kernel-dev-61ec7567db103d537329b0db9a887db570431ff4.zip op-kernel-dev-61ec7567db103d537329b0db9a887db570431ff4.tar.gz |
ACPI: boot correctly with "nosmp" or "maxcpus=0"
In MPS mode, "nosmp" and "maxcpus=0" boot a UP kernel with IOAPIC disabled.
However, in ACPI mode, these parameters didn't completely disable
the IO APIC initialization code and boot failed.
init/main.c:
Disable the IO_APIC if "nosmp" or "maxcpus=0"
undefine disable_ioapic_setup() when it doesn't apply.
i386:
delete ioapic_setup(), it was a duplicate of parse_noapic()
delete undefinition of disable_ioapic_setup()
x86_64:
rename disable_ioapic_setup() to parse_noapic() to match i386
define disable_ioapic_setup() in header to match i386
http://bugzilla.kernel.org/show_bug.cgi?id=1641
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
-rw-r--r-- | arch/i386/kernel/io_apic.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 4b8a8da4..e2f4a1c 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; |