diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-21 13:32:17 +0100 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-02 11:52:05 -0600 |
commit | 2391b50103626316bc82409c9af84fde54b12ebc (patch) | |
tree | f1d3d8f3f4ee02d7b1b40f966889a5ab097c4bf2 /kernel/softirq.c | |
parent | fc80c87f37b19f9efeb59f08f5ed5129e12e14a7 (diff) |
preempt-mark-legitimated-no-resched-sites.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index c9da2c84f99e..a8becbf41900 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -353,7 +353,7 @@ void irq_exit(void) if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched()) tick_nohz_stop_sched_tick(0); #endif - preempt_enable_no_resched(); + __preempt_enable_no_resched(); } /* @@ -759,7 +759,7 @@ static int run_ksoftirqd(void * __bind_cpu) if (local_softirq_pending()) __do_softirq(); local_irq_enable(); - preempt_enable_no_resched(); + __preempt_enable_no_resched(); cond_resched(); preempt_disable(); rcu_note_context_switch((long)__bind_cpu); |