forked from Minki/linux
[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>
This commit is contained in:
parent
30d55280b8
commit
f0ec5e3976
@ -1102,9 +1102,6 @@ int __init acpi_boot_table_init(void)
|
|||||||
dmi_check_system(acpi_dmi_table);
|
dmi_check_system(acpi_dmi_table);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!cpu_has_apic)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If acpi_disabled, bail out
|
* If acpi_disabled, bail out
|
||||||
* One exception: acpi=ht continues far enough to enumerate LAPICs
|
* 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);
|
acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
|
||||||
|
|
||||||
if (!cpu_has_apic)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* set sci_int and PM timer address
|
* set sci_int and PM timer address
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user