|
@@ -229,6 +229,7 @@ asmlinkage void __do_softirq(void)
|
|
|
struct softirq_action *h;
|
|
|
bool in_hardirq;
|
|
|
__u32 pending;
|
|
|
+ int softirq_bit;
|
|
|
int cpu;
|
|
|
|
|
|
/*
|
|
@@ -253,30 +254,30 @@ restart:
|
|
|
|
|
|
h = softirq_vec;
|
|
|
|
|
|
- do {
|
|
|
- if (pending & 1) {
|
|
|
- unsigned int vec_nr = h - softirq_vec;
|
|
|
- int prev_count = preempt_count();
|
|
|
-
|
|
|
- kstat_incr_softirqs_this_cpu(vec_nr);
|
|
|
-
|
|
|
- trace_softirq_entry(vec_nr);
|
|
|
- h->action(h);
|
|
|
- trace_softirq_exit(vec_nr);
|
|
|
- if (unlikely(prev_count != preempt_count())) {
|
|
|
- printk(KERN_ERR "huh, entered softirq %u %s %p"
|
|
|
- "with preempt_count %08x,"
|
|
|
- " exited with %08x?\n", vec_nr,
|
|
|
- softirq_to_name[vec_nr], h->action,
|
|
|
- prev_count, preempt_count());
|
|
|
- preempt_count_set(prev_count);
|
|
|
- }
|
|
|
+ while ((softirq_bit = ffs(pending))) {
|
|
|
+ unsigned int vec_nr;
|
|
|
+ int prev_count;
|
|
|
+
|
|
|
+ h += softirq_bit - 1;
|
|
|
+
|
|
|
+ vec_nr = h - softirq_vec;
|
|
|
+ prev_count = preempt_count();
|
|
|
|
|
|
- rcu_bh_qs(cpu);
|
|
|
+ kstat_incr_softirqs_this_cpu(vec_nr);
|
|
|
+
|
|
|
+ trace_softirq_entry(vec_nr);
|
|
|
+ h->action(h);
|
|
|
+ trace_softirq_exit(vec_nr);
|
|
|
+ if (unlikely(prev_count != preempt_count())) {
|
|
|
+ printk(KERN_ERR "huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
|
|
|
+ vec_nr, softirq_to_name[vec_nr], h->action,
|
|
|
+ prev_count, preempt_count());
|
|
|
+ preempt_count_set(prev_count);
|
|
|
}
|
|
|
+ rcu_bh_qs(cpu);
|
|
|
h++;
|
|
|
- pending >>= 1;
|
|
|
- } while (pending);
|
|
|
+ pending >>= softirq_bit;
|
|
|
+ }
|
|
|
|
|
|
local_irq_disable();
|
|
|
|