Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits

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

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc drivers/idle/intel_idle.c
index e59073efb6fa442a52941ccd9196a0b7fee5dcde,0fdb1d1316c446c508b8c40432ef30a78593b717..5687089e406a648e26f3aa0e72fc414d23e04d41
--- 1/drivers/idle/intel_idle.c
--- 2/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@@ -56,8 -56,8 +56,9 @@@
  #include <asm/intel-family.h>
  #include <asm/mwait.h>
  #include <asm/spec-ctrl.h>
+ #include <asm/tsc.h>
  #include <asm/fpu/api.h>
 +#include <asm/smp.h>
  
  #define INTEL_IDLE_VERSION "0.5.1"
  
@@@ -1809,8 -1800,10 +1810,11 @@@ static void __init intel_idle_init_csta
                if (intel_idle_state_needs_timer_stop(state))
                        state->flags |= CPUIDLE_FLAG_TIMER_STOP;
  
+               if (cx->type > ACPI_STATE_C1 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
+                       mark_tsc_unstable("TSC halts in idle");
+ 
                state->enter = intel_idle;
 +              state->enter_dead = intel_idle_enter_dead;
                state->enter_s2idle = intel_idle_s2idle;
        }
  }

diff --cc tools/objtool/noreturns.h
Simple merge