1 files changed, 3 insertions, 29 deletions

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 6c0e0452dd9b..8e1939f564f4 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -635,39 +635,10 @@ static int __init intel_idle_cpuidle_driver_init(void)
  */
 static int intel_idle_cpu_init(int cpu)
 {
-        int cstate;
         struct cpuidle_device *dev;
 
         dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);
 
-        dev->state_count = 1;
-
-        for (cstate = 0; cstate < CPUIDLE_STATE_MAX; ++cstate) {
-                int num_substates, mwait_hint, mwait_cstate, mwait_substate;
-
-                if (cpuidle_state_table[cstate].enter == NULL)
-                        break;
-
-                if (cstate + 1 > max_cstate) {
-                        printk(PREFIX "max_cstate %d reached\n", max_cstate);
-                        break;
-                }
-
-                mwait_hint = flg2MWAIT(cpuidle_state_table[cstate].flags);
-                mwait_cstate = MWAIT_HINT2CSTATE(mwait_hint);
-                mwait_substate = MWAIT_HINT2SUBSTATE(mwait_hint);
-
-                /* does the state exist in CPUID.MWAIT? */
-                num_substates = (mwait_substates >> ((mwait_cstate + 1) * 4))
-                                        & MWAIT_SUBSTATE_MASK;
-
-                /* if sub-state in table is not enumerated by CPUID */
-                if ((mwait_substate + 1) > num_substates)
-                        continue;
-
-                dev->state_count += 1;
-        }
-
         dev->cpu = cpu;
 
         if (cpuidle_register_device(dev)) {
@@ -679,6 +650,9 @@ static int intel_idle_cpu_init(int cpu)
         if (icpu->auto_demotion_disable_flags)
                 smp_call_function_single(cpu, auto_demotion_disable, NULL, 1);
 
+        if (icpu->disable_promotion_to_c1e)
+                smp_call_function_single(cpu, c1e_promotion_disable, NULL, 1);
+
         return 0;
 }