Merge branch 'core/locking' into tracing/ftrace

[mv-sheeva.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 6edfc2c11d99af1c845689adf0e9fbf1043e723d..7571bcb71be44f637a2d5a633cbe27dbd4eded01 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -191,7 +191,7 @@ asmlinkage void __do_softirq(void)
        account_system_vtime(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0));
-       trace_softirq_enter();
+       lockdep_softirq_enter();
 
        cpu = smp_processor_id();
 restart:
@@ -231,7 +231,7 @@ restart:
        if (pending)
                wakeup_softirqd();
 
-       trace_softirq_exit();
+       lockdep_softirq_exit();
 
        account_system_vtime(current);
        _local_bh_enable();
@@ -637,6 +637,7 @@ static int ksoftirqd(void * __bind_cpu)
                        preempt_enable_no_resched();
                        cond_resched();
                        preempt_disable();
+                       rcu_qsctr_inc((long)__bind_cpu);
                }
                preempt_enable();
                set_current_state(TASK_INTERRUPTIBLE);
@@ -806,6 +807,11 @@ int __init __weak early_irq_init(void)
        return 0;
 }
 
+int __init __weak arch_probe_nr_irqs(void)
+{
+       return 0;
+}
+
 int __init __weak arch_early_irq_init(void)
 {
        return 0;