Merge branch 'linus' into locking-for-linus
[sfrench/cifs-2.6.git] / kernel / softirq.c
index 57d3f67f6f38af7fdfb0fad66ff1cdbef790951e..4877516043000a42278eb13b2bef99e21696671a 100644 (file)
@@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void)
        account_system_vtime(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0));
        account_system_vtime(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0));
-       trace_softirq_enter();
+       lockdep_softirq_enter();
 
        cpu = smp_processor_id();
 restart:
 
        cpu = smp_processor_id();
 restart:
@@ -220,7 +220,7 @@ restart:
        if (pending)
                wakeup_softirqd();
 
        if (pending)
                wakeup_softirqd();
 
-       trace_softirq_exit();
+       lockdep_softirq_exit();
 
        account_system_vtime(current);
        _local_bh_enable();
 
        account_system_vtime(current);
        _local_bh_enable();