diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-21 12:33:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-01 10:28:03 +0100 |
| commit | bd2f55361f18347e890d52ff9cfd8895455ec11b (patch) | |
| tree | 5725e83f96934da2c2d741255db929df34f153eb /kernel | |
| parent | sched/rt: Add schedule_preempt_disabled() (diff) | |
| download | linux-bd2f55361f18347e890d52ff9cfd8895455ec11b.tar.xz linux-bd2f55361f18347e890d52ff9cfd8895455ec11b.zip | |
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')
| -rw-r--r-- | kernel/mutex.c | 4 | ||||
| -rw-r--r-- | kernel/softirq.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index 89096dd8786f..a307cc9c9526 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -240,9 +240,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, /* didn't get the lock, go to sleep: */ spin_unlock_mutex(&lock->wait_lock, flags); - preempt_enable_no_resched(); - schedule(); - preempt_disable(); + schedule_preempt_disabled(); spin_lock_mutex(&lock->wait_lock, flags); } 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) while (!kthread_should_stop()) { preempt_disable(); if (!local_softirq_pending()) { - preempt_enable_no_resched(); - schedule(); - preempt_disable(); + schedule_preempt_disabled(); } __set_current_state(TASK_RUNNING); |