x86: cleanup x86_cpu_to_apicid references

Clean up references to x86_cpu_to_apicid.  Removes extraneous
comments and standardizes on "x86_*_early_ptr" for the early
kernel init references.

Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 3 insertions, 8 deletions

diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 17d21e5b22d6..528ad9696d96 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -125,14 +125,9 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
                 cpu = 0;
         }
         bios_cpu_apicid[cpu] = m->mpc_apicid;
-        /*
-         * We get called early in the the start_kernel initialization
-         * process when the per_cpu data area is not yet setup, so we
-         * use a static array that is removed after the per_cpu data
-         * area is created.
-         */
-        if (x86_cpu_to_apicid_ptr) {
-                u16 *x86_cpu_to_apicid = (u16 *)x86_cpu_to_apicid_ptr;
+        /* are we being called early in kernel startup? */
+        if (x86_cpu_to_apicid_early_ptr) {
+                u16 *x86_cpu_to_apicid = (u16 *)x86_cpu_to_apicid_early_ptr;
                 x86_cpu_to_apicid[cpu] = m->mpc_apicid;
         } else {
                 per_cpu(x86_cpu_to_apicid, cpu) = m->mpc_apicid;