Merge branch 'x86/tsc' into tracing/core

Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 5f8d746a9b81..38aca048e951 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -374,15 +374,15 @@ static int tsc_halts_in_c(int state)
 {
         switch (boot_cpu_data.x86_vendor) {
         case X86_VENDOR_AMD:
+        case X86_VENDOR_INTEL:
                 /*
                  * AMD Fam10h TSC will tick in all
                  * C/P/S0/S1 states when this bit is set.
                  */
-                if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
+                if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
                         return 0;
+
                 /*FALL THROUGH*/
-        case X86_VENDOR_INTEL:
-                /* Several cases known where TSC halts in C2 too */
         default:
                 return state > ACPI_STATE_C1;
         }