diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-10 12:15:51 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-11-10 12:15:51 +0100 |
| commit | 0902912a2ab175ac7b4c633b5f0de946e24ce590 (patch) | |
| tree | 9a5d7fdebb47968c8ced3c81e677b6d08f625f1a | |
| parent | c4fabb49b20d2429994ac320befa071ff492d6f3 (diff) | |
| parent | ca0b4bfa5994856bbcf4227e29f9c73722efaef2 (diff) | |
| download | lwn-0902912a2ab175ac7b4c633b5f0de946e24ce590.tar.gz lwn-0902912a2ab175ac7b4c633b5f0de946e24ce590.zip | |
Merge branch 'rt/head' into rt/2.6.31
| -rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 590049c17dc8..2ce0962e5929 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -1033,10 +1033,10 @@ sleep_more: goto sleep_more; } per_cpu(softirq_running, cpu) |= softirq_mask; - __preempt_enable_no_resched(); set_softirq_pending(local_softirq_pending() & ~softirq_mask); local_bh_disable(); local_irq_enable(); + preempt_enable(); h = &softirq_vec[data->nr]; if (h) |