aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/idle
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/idle')
-rw-r--r--drivers/idle/intel_idle.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 1a38dd7dfe4e..0e8fab1913df 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -71,7 +71,6 @@
71static struct cpuidle_driver intel_idle_driver = { 71static struct cpuidle_driver intel_idle_driver = {
72 .name = "intel_idle", 72 .name = "intel_idle",
73 .owner = THIS_MODULE, 73 .owner = THIS_MODULE,
74 .en_core_tk_irqen = 1,
75}; 74};
76/* intel_idle.max_cstate=0 disables driver */ 75/* intel_idle.max_cstate=0 disables driver */
77static int max_cstate = CPUIDLE_STATE_MAX - 1; 76static int max_cstate = CPUIDLE_STATE_MAX - 1;
@@ -339,7 +338,6 @@ static int intel_idle(struct cpuidle_device *dev,
339 if (!(lapic_timer_reliable_states & (1 << (cstate)))) 338 if (!(lapic_timer_reliable_states & (1 << (cstate))))
340 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); 339 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
341 340
342 stop_critical_timings();
343 if (!need_resched()) { 341 if (!need_resched()) {
344 342
345 __monitor((void *)&current_thread_info()->flags, 0, 0); 343 __monitor((void *)&current_thread_info()->flags, 0, 0);
@@ -348,8 +346,6 @@ static int intel_idle(struct cpuidle_device *dev,
348 __mwait(eax, ecx); 346 __mwait(eax, ecx);
349 } 347 }
350 348
351 start_critical_timings();
352
353 if (!(lapic_timer_reliable_states & (1 << (cstate)))) 349 if (!(lapic_timer_reliable_states & (1 << (cstate))))
354 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu); 350 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
355 351