Skip to content

Commit

Permalink
[PATCH] Remove wrong cpu_has_apic checks that came from mismerging
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed May 4, 2006
1 parent 30d5528 commit f0ec5e3
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions arch/i386/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
*/
Expand Down

0 comments on commit f0ec5e3

Please sign in to comment.