summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-05-03 19:54:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-03 20:05:31 -0700
commitf0ec5e39765cd254d436a6d86e211d81795952a4 (patch)
tree1aad5506c0e758950990b9153754200b67389921 /arch
parent30d55280b867aa0cae99f836ad0181bb0bf8f9cb (diff)
downloadlinux-3.10-f0ec5e39765cd254d436a6d86e211d81795952a4.tar.gz
linux-3.10-f0ec5e39765cd254d436a6d86e211d81795952a4.tar.bz2
linux-3.10-f0ec5e39765cd254d436a6d86e211d81795952a4.zip
[PATCH] Remove wrong cpu_has_apic checks that came from mismerging
We only need to check cpu_has_apic in the IO-APIC/L-APIC parsing, not for all of ACPI. Signed-off-by: Andi Kleen <ak@suse.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/i386/kernel/acpi/boot.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 4c785a67d58..40e5aba3ad3 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -1102,9 +1102,6 @@ int __init acpi_boot_table_init(void)
dmi_check_system(acpi_dmi_table);
#endif
- if (!cpu_has_apic)
- return -ENODEV;
-
/*
* If acpi_disabled, bail out
* One exception: acpi=ht continues far enough to enumerate LAPICs
@@ -1151,9 +1148,6 @@ int __init acpi_boot_init(void)
acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
- if (!cpu_has_apic)
- return -ENODEV;
-
/*
* set sci_int and PM timer address
*/