Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 259d1d2be076fc3b7fe43e6ee1a2e6086709447b..497e9b7077c14a4e36056bbffd75965fed9f3df2 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1023,8 +1023,6 @@ int common_cpu_up(unsigned int cpu, struct task_struct *idle)
 static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
                       int *cpu0_nmi_registered)
 {
-       volatile u32 *trampoline_status =
-               (volatile u32 *) __va(real_mode_header->trampoline_status);
        /* start_ip had better be page-aligned! */
        unsigned long start_ip = real_mode_header->trampoline_start;
 
@@ -1116,9 +1114,6 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
                }
        }
 
-       /* mark "stuck" area as not stuck */
-       *trampoline_status = 0;
-
        if (x86_platform.legacy.warm_reset) {
                /*
                 * Cleanup possible dangling ends...
@@ -1368,8 +1363,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
        pr_info("CPU0: ");
        print_cpu_info(&cpu_data(0));
 
-       native_pv_lock_init();
-
        uv_system_init();
 
        set_mtrr_aps_delayed_init();
@@ -1399,6 +1392,7 @@ void __init native_smp_prepare_boot_cpu(void)
        /* already set me in cpu_online_mask in boot_cpu_init() */
        cpumask_set_cpu(me, cpu_callout_mask);
        cpu_set_state_online(me);
+       native_pv_lock_init();
 }
 
 void __init calculate_max_logical_packages(void)