tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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: Linus Torvalds <torvalds@osdl.org>

authored by

Andi Kleen and committed by
Linus Torvalds 87cb23a4 d16e8624

+4 -1
+4 -1
arch/i386/kernel/acpi/boot.c
··· 168 168 unsigned long i; 169 169 int config_size; 170 170 171 - if (!phys_addr || !size || !cpu_has_apic) 171 + if (!phys_addr || !size) 172 172 return -EINVAL; 173 173 174 174 mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size); ··· 1101 1101 #ifdef __i386__ 1102 1102 dmi_check_system(acpi_dmi_table); 1103 1103 #endif 1104 + 1105 + if (!cpu_has_apic) 1106 + return -ENODEV; 1104 1107 1105 1108 /* 1106 1109 * If acpi_disabled, bail out