diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-27 19:54:49 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-27 19:54:49 -0400 |
commit | e4f5a3adc454745fea35f1c312e14cbeba6e0ea4 (patch) | |
tree | 7dae08f7d3466fcf158808784ec3b706e6cafec6 /drivers/idle/intel_idle.c | |
parent | ae6208301e1e37a203fab817b59279a0f5d774c6 (diff) | |
parent | a8e39c35b5d09598e129aa9b5e6f35aa3a1915d9 (diff) |
Merge branch 'pm-cpuidle'
* pm-cpuidle: (51 commits)
cpuidle: add maintainer entry
ARM: s3c64xx: cpuidle: use init/exit common routine
SH: cpuidle: use init/exit common routine
cpuidle: fix comment format
ARM: imx: cpuidle: use init/exit common routine
ARM: davinci: cpuidle: use init/exit common routine
ARM: kirkwood: cpuidle: use init/exit common routine
ARM: calxeda: cpuidle: use init/exit common routine
ARM: tegra: cpuidle: use init/exit common routine for tegra3
ARM: tegra: cpuidle: use init/exit common routine for tegra2
ARM: OMAP4: cpuidle: use init/exit common routine
ARM: shmobile: cpuidle: use init/exit common routine
ARM: tegra: cpuidle: use init/exit common routine
ARM: OMAP3: cpuidle: use init/exit common routine
ARM: at91: cpuidle: use init/exit common routine
ARM: ux500: cpuidle: use init/exit common routine
cpuidle: make a single register function for all
ARM: ux500: cpuidle: replace for_each_online_cpu by for_each_possible_cpu
cpuidle: remove en_core_tk_irqen flag
ARM: OMAP3: remove cpuidle_wrap_enter
...
Diffstat (limited to 'drivers/idle/intel_idle.c')
-rw-r--r-- | drivers/idle/intel_idle.c | 4 |
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 @@ | |||
71 | static struct cpuidle_driver intel_idle_driver = { | 71 | static 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 */ |
77 | static int max_cstate = CPUIDLE_STATE_MAX - 1; | 76 | static 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 *)¤t_thread_info()->flags, 0, 0); | 343 | __monitor((void *)¤t_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 | ||