diff options
| author | Yanmin Zhang <yanmin_zhang@linux.intel.com> | 2012-01-11 00:48:21 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-01-17 20:19:58 +0100 |
| commit | 63ff07beaebef2a82da41cf04053ae88b579226d (patch) | |
| tree | a7a7dfc0c1a2de4d2b45e6762226760f44bbc076 /drivers/idle | |
| parent | intel_idle: fix API misuse (diff) | |
| download | linux-63ff07beaebef2a82da41cf04053ae88b579226d.tar.xz linux-63ff07beaebef2a82da41cf04053ae88b579226d.zip | |
intel_idle: remove redundant local_irq_disable() call
irq disabling happens earlier in process_32.c:cpu_idle. Basically,
cpuidle_state->enter is called, cpu irq is disabled. cpuidle_state->enter
would turn on irq when exiting.
intel_idle doesn't follow this assumption. Although it doesn't cause real
issue, it misleads developers. Remove the call to local_irq_disable() at
entry.
[akpm@linux-foundation.org: add comment]
Signed-off-by: Mingming Zhang <mingmingx.zhang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/idle')
| -rw-r--r-- | drivers/idle/intel_idle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index af0b4a5d52f2..920c61c730a1 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -232,6 +232,7 @@ static int get_driver_data(int cstate) * @drv: cpuidle driver * @index: index of cpuidle state * + * Must be called under local_irq_disable(). */ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -247,8 +248,6 @@ static int intel_idle(struct cpuidle_device *dev, cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; - local_irq_disable(); - /* * leave_mm() to avoid costly and often unnecessary wakeups * for flushing the user TLB's associated with the active mm. |