diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-01-13 17:37:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 17:37:05 +0100 |
commit | c9c8986847d2f4fc474c10ee08afa57e7474096d (patch) | |
tree | b4ae6347b710fed25619df7ff9ce009e74f7ada7 /drivers/thermal/intel_powerclamp.c | |
parent | 0bd3a173d711857fc9f583eb5825386cc08f3948 (diff) | |
parent | 7d590cca7cd2cce4ed7c47d221d6f90566653ba8 (diff) |
Merge branch 'x86/idle' into sched/core
Merge these x86 specific bits - we are going to add generic bits as well.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/thermal/intel_powerclamp.c')
-rw-r--r-- | drivers/thermal/intel_powerclamp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c index 8f181b3f842b..e8275f2df9af 100644 --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c @@ -438,9 +438,7 @@ static int clamp_thread(void *arg) */ local_touch_nmi(); stop_critical_timings(); - __monitor((void *)¤t_thread_info()->flags, 0, 0); - cpu_relax(); /* allow HT sibling to run */ - __mwait(eax, ecx); + mwait_idle_with_hints(eax, ecx); start_critical_timings(); atomic_inc(&idle_wakeup_counter); } |