diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:38:30 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:38:30 -0400 |
| commit | 4e8f10b7ccf1c3c53a818a157962074a7340732e (patch) | |
| tree | b5b60b535b9068541bd7c1504216c2428c5cb109 /arch/i386 | |
| parent | 63518472c05a351d779f35803e6ccfb361ae630a (diff) | |
| parent | 9cfda2c94df61c9f859b474abe774c65a4464d0a (diff) | |
Pull novell-bugzilla-156426 into release branch
Conflicts:
arch/i386/kernel/acpi/boot.c
Diffstat (limited to 'arch/i386')
| -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) | |||
| 215 | { | 215 | { |
| 216 | struct acpi_table_madt *madt = NULL; | 216 | struct acpi_table_madt *madt = NULL; |
| 217 | 217 | ||
| 218 | if (!phys_addr || !size) | 218 | if (!phys_addr || !size || !cpu_has_apic) |
| 219 | return -EINVAL; | 219 | return -EINVAL; |
| 220 | 220 | ||
| 221 | madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size); | 221 | madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size); |
| @@ -754,7 +754,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) | |||
| 754 | return -ENODEV; | 754 | return -ENODEV; |
| 755 | } | 755 | } |
| 756 | 756 | ||
| 757 | if (!cpu_has_apic) | 757 | if (!cpu_has_apic) |
| 758 | return -ENODEV; | 758 | return -ENODEV; |
| 759 | 759 | ||
| 760 | /* | 760 | /* |