Re: 2.6.17-rc1-mm3: time-i386-clocksource-drivers*.patch broke userspace apps

[Andi Kleen <ak@suse.de>]

On Tuesday 02 May 2006 20:16, john stultz wrote:

> It looks like its from the patch:
> 	i386-x86-64-fix-acpi-disabled-lapic-handling.patch
> 
> 
> The second chunk adds:
> 
> +       if (!cpu_has_apic)
> +               return -ENODEV;
> +
> 
> Right before we probe for the ACPI PM timer.
> 
> 
> Andi, is there some way we can move that to after the ACPI PM probe?


Yes there was some merging trouble with this and some of the hunks 
applied to the wrong places and I didn't remove the wrong one 
in the first fixup patch. Sorry. This should fix it up.

Andrew, can you send that one to Linus please?

-Andi

Remove wrong cpu_has_apic checks that came from mismerging.

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@suse.de>

Index: linux/arch/i386/kernel/acpi/boot.c
===================================================================
--- linux.orig/arch/i386/kernel/acpi/boot.c
+++ linux/arch/i386/kernel/acpi/boot.c
@@ -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
 	 */