1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 41665d2f9f93..56ac09d6c930 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -220,9 +220,8 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
         kt_before = ktime_get_real();
 
         stop_critical_timings();
-#ifndef MODULE
         trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu);
-#endif
+        trace_cpu_idle((eax >> 4) + 1, cpu);
         if (!need_resched()) {
 
                 __monitor((void *)&current_thread_info()->flags, 0, 0);
@@ -273,8 +272,6 @@ static int intel_idle_probe(void)
 
         pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates);
 
-        if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
-                lapic_timer_reliable_states = 0xFFFFFFFF;
 
         if (boot_cpu_data.x86 != 6)     /* family 6 */
                 return -ENODEV;
@@ -286,8 +283,6 @@ static int intel_idle_probe(void)
         case 0x1F:      /* Core i7 and i5 Processor - Nehalem */
         case 0x2E:      /* Nehalem-EX Xeon */
         case 0x2F:      /* Westmere-EX Xeon */
-                lapic_timer_reliable_states = (1 << 1);  /* C1 */
-
         case 0x25:      /* Westmere */
         case 0x2C:      /* Westmere */
                 cpuidle_state_table = nehalem_cstates;
@@ -295,7 +290,6 @@ static int intel_idle_probe(void)
 
         case 0x1C:      /* 28 - Atom Processor */
         case 0x26:      /* 38 - Lincroft Atom Processor */
-                lapic_timer_reliable_states = (1 << 1); /* C1 */
                 cpuidle_state_table = atom_cstates;
                 break;
 
@@ -303,10 +297,6 @@ static int intel_idle_probe(void)
         case 0x2D:      /* SNB Xeon */
                 cpuidle_state_table = snb_cstates;
                 break;
-#ifdef FUTURE_USE
-        case 0x17:      /* 23 - Core 2 Duo */
-                lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */
-#endif
 
         default:
                 pr_debug(PREFIX "does not run on family %d model %d\n",
@@ -314,6 +304,9 @@ static int intel_idle_probe(void)
                 return -ENODEV;
         }
 
+        if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
+                lapic_timer_reliable_states = 0xFFFFFFFF;
+
         pr_debug(PREFIX "v" INTEL_IDLE_VERSION
                 " model 0x%X\n", boot_cpu_data.x86_model);