git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6351847
)
Pull novell-bugzilla-156426 into release branch
author
Len Brown
<len.brown@intel.com>
Thu, 15 Jun 2006 19:38:30 +0000
(15:38 -0400)
committer
Len Brown
<len.brown@intel.com>
Thu, 15 Jun 2006 19:38:30 +0000
(15:38 -0400)
Conflicts:
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c
patch
|
blob
|
history
diff --git
a/arch/i386/kernel/acpi/boot.c
b/arch/i386/kernel/acpi/boot.c
index
7ff6f9d
..
5ccbf58
100644
(file)
--- 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;
/*