PCI: spear: Fix Section mismatch compilation warning for probe()

[cascardo/linux.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 92f24f5..5918d22 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -232,7 +232,6 @@ asmlinkage __visible void __do_softirq(void)
        bool in_hardirq;
        __u32 pending;
        int softirq_bit;
-       int cpu;
 
        /*
         * Mask out PF_MEMALLOC s current task context is borrowed for the
@@ -247,7 +246,6 @@ asmlinkage __visible void __do_softirq(void)
        __local_bh_disable_ip(_RET_IP_, SOFTIRQ_OFFSET);
        in_hardirq = lockdep_softirq_start();
 
-       cpu = smp_processor_id();
 restart:
        /* Reset the pending bitmask before enabling irqs */
        set_softirq_pending(0);
@@ -276,11 +274,11 @@ restart:
                               prev_count, preempt_count());
                        preempt_count_set(prev_count);
                }
-               rcu_bh_qs(cpu);
                h++;
                pending >>= softirq_bit;
        }
 
+       rcu_bh_qs(smp_processor_id());
        local_irq_disable();
 
        pending = local_softirq_pending();