diff options
| -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) | |||
| 232 | * @drv: cpuidle driver | 232 | * @drv: cpuidle driver |
| 233 | * @index: index of cpuidle state | 233 | * @index: index of cpuidle state |
| 234 | * | 234 | * |
| 235 | * Must be called under local_irq_disable(). | ||
| 235 | */ | 236 | */ |
| 236 | static int intel_idle(struct cpuidle_device *dev, | 237 | static int intel_idle(struct cpuidle_device *dev, |
| 237 | struct cpuidle_driver *drv, int index) | 238 | struct cpuidle_driver *drv, int index) |
| @@ -247,8 +248,6 @@ static int intel_idle(struct cpuidle_device *dev, | |||
| 247 | 248 | ||
| 248 | cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; | 249 | cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; |
| 249 | 250 | ||
| 250 | local_irq_disable(); | ||
| 251 | |||
| 252 | /* | 251 | /* |
| 253 | * leave_mm() to avoid costly and often unnecessary wakeups | 252 | * leave_mm() to avoid costly and often unnecessary wakeups |
| 254 | * for flushing the user TLB's associated with the active mm. | 253 | * for flushing the user TLB's associated with the active mm. |
