Commit-ID: 71434bc7ac606506d04e5f319fada44567072494 Gitweb: http://git.kernel.org/tip/71434bc7ac606506d04e5f319fada44567072494 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Wed, 11 Dec 2013 12:21:17 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> 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 <peterz@xxxxxxxxxxxxx> Cc: rjw@xxxxxxxxxxxxx Cc: Eliezer Tamir <eliezer.tamir@xxxxxxxxxxxxxxx> Cc: rui.zhang@xxxxxxxxx Cc: jacob.jun.pan@xxxxxxxxxxxxxxx Cc: Mike Galbraith <bitbucket@xxxxxxxxx> Cc: hpa@xxxxxxxxx Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Cc: lenb@xxxxxxxxxx Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/n/tip-zcfvacdlvlr63qmnn5i58vuj@xxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |