diff --git a/[refs] b/[refs]
index 71081e6ab059..36493281967d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 992860e991f2015fb8c8df65aa32afa0dcbb4430
+refs/heads/master: d12c1a37925a8ec386994169605fe99217295199
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 19908b26cf80..cdb1f82d3bd2 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -909,7 +909,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 
 	rt_mutex_init_task(p);
 
-#ifdef CONFIG_TRACE_IRQFLAGS
+#ifdef CONFIG_PROVE_LOCKING
 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
 	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
 #endif