diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 21:38:30 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 21:38:30 +0200 |
| commit | 4e8f10b7ccf1c3c53a818a157962074a7340732e (patch) | |
| tree | b5b60b535b9068541bd7c1504216c2428c5cb109 /arch/i386/kernel/acpi | |
| parent | Pull trivial1 into release branch (diff) | |
| parent | [ACPI] fix "nolapic" flag in ACPI mode (diff) | |
| download | linux-4e8f10b7ccf1c3c53a818a157962074a7340732e.tar.xz linux-4e8f10b7ccf1c3c53a818a157962074a7340732e.zip | |
Pull novell-bugzilla-156426 into release branch
Conflicts:
arch/i386/kernel/acpi/boot.c
Diffstat (limited to 'arch/i386/kernel/acpi')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 7ff6f9dadc66..5ccbf58ec94f 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) + if (!phys_addr || !size || !cpu_has_apic) return -EINVAL; madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size); @@ -754,7 +754,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) return -ENODEV; } - if (!cpu_has_apic) + if (!cpu_has_apic) return -ENODEV; /* |