The patch titled
Remove wrong cpu_has_apic checks that came from mismerging
has been added to the -mm tree. Its filename is
remove-wrong-cpu_has_apic-checks-that-came-from-mismerging.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>
We only need to check cpu_has_apic in the IO-APIC/L-APIC parsing, not for
all of ACPI.
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/acpi/boot.c | 6 ------
1 file changed, 6 deletions(-)
diff -puN arch/i386/kernel/acpi/boot.c~remove-wrong-cpu_has_apic-checks-that-came-from-mismerging arch/i386/kernel/acpi/boot.c
--- devel/arch/i386/kernel/acpi/boot.c~remove-wrong-cpu_has_apic-checks-that-came-from-mismerging 2006-05-03 05:56:24.000000000 -0700
+++ devel-akpm/arch/i386/kernel/acpi/boot.c 2006-05-03 05:56:24.000000000 -0700
@@ -1102,9 +1102,6 @@ int __init acpi_boot_table_init(void)
dmi_check_system(acpi_dmi_table);
#endif
- if (!cpu_has_apic)
- return -ENODEV;
-
/*
* If acpi_disabled, bail out
* One exception: acpi=ht continues far enough to enumerate LAPICs
@@ -1151,9 +1148,6 @@ 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
remove-wrong-cpu_has_apic-checks-that-came-from-mismerging.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
