2 files changed, 9 insertions, 10 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ad59edd84de7..65a0ccdc3050 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -194,6 +194,12 @@ static void smp_callin(void)
         smp_store_cpu_info(cpuid);
 
         /*
+         * The topology information must be up to date before
+         * calibrate_delay() and notify_cpu_starting().
+         */
+        set_cpu_sibling_map(raw_smp_processor_id());
+
+        /*
          * Get our bogomips.
          * Update loops_per_jiffy in cpu_data. Previous call to
          * smp_store_cpu_info() stored a value that is close but not as
@@ -203,11 +209,6 @@ static void smp_callin(void)
         cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;
         pr_debug("Stack at about %p\n", &cpuid);
 
-        /*
-         * This must be done before setting cpu_online_mask
-         * or calling notify_cpu_starting.
-         */
-        set_cpu_sibling_map(raw_smp_processor_id());
         wmb();
 
         notify_cpu_starting(cpuid);
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 796d96bb0821..ad2b925a808e 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1346,12 +1346,10 @@ void __init tsc_init(void)
 unsigned long calibrate_delay_is_known(void)
 {
         int sibling, cpu = smp_processor_id();
-        struct cpumask *mask = topology_core_cpumask(cpu);
+        int constant_tsc = cpu_has(&cpu_data(cpu), X86_FEATURE_CONSTANT_TSC);
+        const struct cpumask *mask = topology_core_cpumask(cpu);
 
-        if (!tsc_disabled && !cpu_has(&cpu_data(cpu), X86_FEATURE_CONSTANT_TSC))
-                return 0;
-
-        if (!mask)
+        if (tsc_disabled || !constant_tsc || !mask)
                 return 0;
 
         sibling = cpumask_any_but(mask, cpu);