diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 19:59:18 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 19:59:18 +0100 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /arch/i386/kernel/acpi | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/i386/kernel/acpi')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 049a2558379..40e5aba3ad3 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size) { struct acpi_table_madt *madt = NULL; - if (!phys_addr || !size || !cpu_has_apic) + if (!phys_addr || !size) return -EINVAL; madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size); @@ -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 |