Merge branch 'core/locking' into tracing/ftrace

2009-03-13 01:33:21 +01:00
parent aecfcde920 d820ac4c2f
commit 480c93df5b
98 changed files with 983 additions and 716 deletions
--- 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();