x86: make apic_32/64.c more like
except x2apic, detec_init_APIC, and calibrating_APIC_clock
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index eeb6983..dca6c24 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -69,6 +69,9 @@
return 0;
}
early_param("lapic", parse_lapic);
+/* Local APIC was disabled by the BIOS and enabled by the kernel */
+static int enabled_via_apicbase;
+
#endif
#ifdef CONFIG_X86_64
@@ -1279,6 +1282,7 @@
return 0;
}
+#ifdef CONFIG_X86_64
void __init early_init_lapic_mapping(void)
{
unsigned long phys_addr;
@@ -1302,6 +1306,7 @@
*/
boot_cpu_physical_apicid = read_apic_id();
}
+#endif
/**
* init_apic_mappings - initialize APIC mappings
@@ -1334,7 +1339,8 @@
* Fetch the APIC ID of the BSP in case we have a
* default configuration (or the MP table is broken).
*/
- boot_cpu_physical_apicid = read_apic_id();
+ if (boot_cpu_physical_apicid == -1U)
+ boot_cpu_physical_apicid = read_apic_id();
}
/*
@@ -1782,6 +1788,7 @@
#endif /* CONFIG_PM */
+#ifdef CONFIG_X86_64
/*
* apic_is_clustered_box() -- Check if we can expect good TSC
*
@@ -1857,6 +1864,7 @@
*/
return (clusters > 2);
}
+#endif
/*
* APIC command line parameters