diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-20 20:59:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-20 20:59:26 +0200 |
| commit | d1e9ae47a0285d3f1699e8219ce50f656243b93f (patch) | |
| tree | 2f5a68b5ba1677bcd49ee759f09ffc5ccccb1455 /kernel/softirq.c | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b (diff) | |
| parent | a841796f11c90d53dbac773be56b04fbee8af272 (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 40cf63ddd4b3..fca82c32042b 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -315,16 +315,24 @@ static inline void invoke_softirq(void) { if (!force_irqthreads) __do_softirq(); - else + else { + __local_bh_disable((unsigned long)__builtin_return_address(0), + SOFTIRQ_OFFSET); wakeup_softirqd(); + __local_bh_enable(SOFTIRQ_OFFSET); + } } #else static inline void invoke_softirq(void) { if (!force_irqthreads) do_softirq(); - else + else { + __local_bh_disable((unsigned long)__builtin_return_address(0), + SOFTIRQ_OFFSET); wakeup_softirqd(); + __local_bh_enable(SOFTIRQ_OFFSET); + } } #endif |