aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-05-01 15:15:49 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-01 21:17:43 -0400
commit32828546b32a96d550b85eab25609bc4ba3942ab (patch)
tree96d48910315bca328d34985337a99a8b41e8be6e /arch
parentd2610202290b4924b71747314a0f88f28807702e (diff)
[PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
The patch I submitted earlier to fix disabled LAPIC handling in ACPI was mismerged for some reason I still don't quite understand. Parts of it was applied to the wrong function. This patch fixes it up. Cc: <len.brown@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/acpi/boot.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 049a25583793..4c785a67d585 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 || !cpu_has_apic) 218 if (!phys_addr || !size)
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);
@@ -1151,6 +1151,9 @@ int __init acpi_boot_init(void)
1151 1151
1152 acpi_table_parse(ACPI_BOOT, acpi_parse_sbf); 1152 acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
1153 1153
1154 if (!cpu_has_apic)
1155 return -ENODEV;
1156
1154 /* 1157 /*
1155 * set sci_int and PM timer address 1158 * set sci_int and PM timer address
1156 */ 1159 */