Merge remote branch 'lttng/2.6.38.2-lttng-0.248'

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index ec42bf73455..e0841c537db 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2439,6 +2439,8 @@ void trace_softirqs_off(unsigned long ip)
 {
 	struct task_struct *curr = current;
 
+	trace_lockdep_softirqs_off(ip);
+
 	if (unlikely(!debug_locks))
 		return;
 
@@ -2462,8 +2464,6 @@ static void __lockdep_trace_alloc(gfp_t gfp_mask, unsigned long flags)
 {
 	struct task_struct *curr = current;
 
-	trace_lockdep_softirqs_off(ip);
-
 	if (unlikely(!debug_locks))
 		return;