[tip:sched/idle] sched, thermal: Clean up preempt_enable_no_resched() abuse

[tip-bot for Peter Zijlstra]

Commit-ID: 71434bc7ac606506d04e5f319fada44567072494
Gitweb: http://git.kernel.org/tip/71434bc7ac606506d04e5f319fada44567072494
Author: Peter Zijlstra <pet...@infradead.org>
AuthorDate: Wed, 11 Dec 2013 12:21:17 +0100
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Sun, 12 Jan 2014 14:50:39 +0100

sched, thermal: Clean up preempt_enable_no_resched() abuse

The only valid use of preempt_enable_no_resched() is if the very next
line is schedule() or if we know preemption cannot actually be enabled
by that statement due to known more preempt_count 'refs'.

Signed-off-by: Peter Zijlstra <pet...@infradead.org>
Cc: r...@rjwysocki.net
Cc: Eliezer Tamir <elieze...@linux.intel.com>
Cc: rui....@intel.com
Cc: jacob....@linux.intel.com
Cc: Mike Galbraith <bitb...@online.de>
Cc: h...@zytor.com
Cc: Arjan van de Ven <ar...@linux.intel.com>
Cc: le...@kernel.org
Cc: Linus Torvalds <torv...@linux-foundation.org>
Cc: Andrew Morton <ak...@linux-foundation.org>
Link: http://lkml.kernel.org/n/tip-zcfvacdlvl...@git.kernel.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
drivers/thermal/intel_powerclamp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
index e8275f2..d833c8f 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -443,7 +443,7 @@ static int clamp_thread(void *arg)
atomic_inc(&idle_wakeup_counter);
}
tick_nohz_idle_exit();
- preempt_enable_no_resched();
+ preempt_enable();
}
del_timer_sync(&wakeup_timer);
clear_bit(cpunr, cpu_clamping_mask);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/