aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-21 07:33:18 -0400
committerIngo Molnar <mingo@elte.hu>2012-03-01 04:28:03 -0500
commitbd2f55361f18347e890d52ff9cfd8895455ec11b (patch)
tree5725e83f96934da2c2d741255db929df34f153eb /kernel/softirq.c
parentc5491ea779793f977d282754db478157cc409d82 (diff)
sched/rt: Use schedule_preempt_disabled()
Coccinelle based conversion. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/n/tip-24swm5zut3h9c4a6s46x8rws@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 4eb3a0fa351e..79b524767a24 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -744,9 +744,7 @@ static int run_ksoftirqd(void * __bind_cpu)
744 while (!kthread_should_stop()) { 744 while (!kthread_should_stop()) {
745 preempt_disable(); 745 preempt_disable();
746 if (!local_softirq_pending()) { 746 if (!local_softirq_pending()) {
747 preempt_enable_no_resched(); 747 schedule_preempt_disabled();
748 schedule();
749 preempt_disable();
750 } 748 }
751 749
752 __set_current_state(TASK_RUNNING); 750 __set_current_state(TASK_RUNNING);