Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[~andy/linux] / kernel / lockdep.c

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 4fa6eeb4e8a7f0c6111a0cb5d67fa6f9671bad5b..06b0c3568f0b230a8c6b669d055c8c442a7eb790 100644 (file)
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -25,6 +25,7 @@
  * Thanks to Arjan van de Ven for coming up with the initial idea of
  * mapping lock dependencies runtime.
  */
+#define DISABLE_BRANCH_PROFILING
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/delay.h>