Skip to content

L
linux-davinci
Commit 0902912a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

Merge branch 'rt/head' into rt/2.6.31

parents c4fabb49 ca0b4bfa
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
kernel/softirq.c
View file @ 0902912a
...@@ -1033,10 +1033,10 @@ sleep_more: ...@@ -1033,10 +1033,10 @@ sleep_more:
goto sleep_more; goto sleep_more;
} }
per_cpu(softirq_running, cpu) |= softirq_mask; per_cpu(softirq_running, cpu) |= softirq_mask;
__preempt_enable_no_resched();
set_softirq_pending(local_softirq_pending() & ~softirq_mask); set_softirq_pending(local_softirq_pending() & ~softirq_mask);
local_bh_disable(); local_bh_disable();
local_irq_enable(); local_irq_enable();
preempt_enable();
h = &softirq_vec[data->nr]; h = &softirq_vec[data->nr];
if (h) if (h)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment