Merge branch 'x86/urgent' into x86/apic, to resolve conflicts

 Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/cpu/intel.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/cpu/common.c
index 05e0b31f75e9b4a18d4ad45332f1bc92f66b81fb,fbc4e60d027cbff23b91e0d8cf2720cabb64803c..087d217342867fc6c4c0a5d669c6be5ba97c7cee
--- 1/arch/x86/kernel/cpu/common.c
--- 2/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1543,10 -1589,9 +1543,11 @@@ static void __init early_identify_cpu(s
                get_cpu_vendor(c);
                get_cpu_cap(c);
                setup_force_cpu_cap(X86_FEATURE_CPUID);
+               get_cpu_address_sizes(c);
                cpu_parse_early_param();
  
 +              cpu_init_topology(c);
 +
                if (this_cpu->c_early_init)
                        this_cpu->c_early_init(c);
  
@@@ -1557,11 -1602,9 +1558,10 @@@
                        this_cpu->c_bsp_init(c);
        } else {
                setup_clear_cpu_cap(X86_FEATURE_CPUID);
+               get_cpu_address_sizes(c);
 +              cpu_init_topology(c);
        }
  
-       get_cpu_address_sizes(c);
- 
        setup_force_cpu_cap(X86_FEATURE_ALWAYS);
  
        cpu_set_bug_bits(c);

diff --cc arch/x86/kernel/cpu/intel.c
index 1bb37a69d8379cf81c2b3b06ee8d8d5a1df682ae,40dec9b56f87db8348c1a242330f243c22c5199d..be30d7fa2e66bc0cf0e76d21c2767c127ce8ed82
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@ -315,6 -399,20 +399,13 @@@ static void early_init_intel(struct cpu
        }
  
        check_memory_type_self_snoop_errata(c);
 -      /*
 -       * Get the number of SMT siblings early from the extended topology
 -       * leaf, if available. Otherwise try the legacy SMT detection.
 -       */
 -      if (detect_extended_topology_early(c) < 0)
 -              detect_ht_early(c);
 -
+ 
+       /*
+        * Adjust the number of physical bits early because it affects the
+        * valid bits of the MTRR mask registers.
+        */
+       if (cpu_has(c, X86_FEATURE_TME))
+               detect_tme_early(c);
  }
  
  static void bsp_init_intel(struct cpuinfo_x86 *c)

diff --cc arch/x86/xen/smp.c
Simple merge