The patch titled
i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
has been added to the -mm tree. Its filename is
i386-x86-64-fix-acpi-disabled-lapic-handling.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: "Andi Kleen" <ak@xxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/acpi/boot.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
diff -puN arch/i386/kernel/acpi/boot.c~i386-x86-64-fix-acpi-disabled-lapic-handling arch/i386/kernel/acpi/boot.c
--- 25/arch/i386/kernel/acpi/boot.c~i386-x86-64-fix-acpi-disabled-lapic-handling Fri Apr 28 16:43:21 2006
+++ 25-akpm/arch/i386/kernel/acpi/boot.c Fri Apr 28 16:43:21 2006
@@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsign
{
struct acpi_table_madt *madt = NULL;
- if (!phys_addr || !size || !cpu_has_apic)
+ if (!phys_addr || !size)
return -EINVAL;
madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@ -1151,6 +1151,9 @@ int __init acpi_boot_init(void)
acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
+ if (!cpu_has_apic)
+ return -ENODEV;
+
/*
* set sci_int and PM timer address
*/
_
Patches currently in -mm which might be from ak@xxxxxxx are
origin.patch
x86_64-add-compat_sys_vmsplice-and-use-it-in.patch
i386-x86-64-fix-acpi-disabled-lapic-handling.patch
i386-fix-overflow-in-e820_all_mapped.patch
i386-remove-apic=-warning.patch
git-acpi.patch
git-agpgart.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
