summaryrefslogtreecommitdiffstats
path: root/lib/Kconfig.debug
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-10-14 15:14:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-14 15:14:20 -0400
commit60a6ca6c943bee3c76b5905e66d5fcd83ae8d34f (patch)
treed9e96036c963ace769577e3ebf6af76fafcc8948 /lib/Kconfig.debug
parent2b34218e893a0ff39f6f46517cb5df2f990db8c0 (diff)
parentb483cf3bc249d7af706390efa63d6671e80d1c09 (diff)
downloadlinux-60a6ca6c943bee3c76b5905e66d5fcd83ae8d34f.tar.bz2
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar: "Two lockdep fixes for bugs introduced by the cross-release dependency tracking feature - plus a commit that disables it because performance regressed in an absymal fashion on some systems" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: locking/lockdep: Disable cross-release features for now locking/selftest: Avoid false BUG report locking/lockdep: Fix stacktrace mess
Diffstat (limited to 'lib/Kconfig.debug')
-rw-r--r--lib/Kconfig.debug4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c1e720a22c71..dfdad67d8f6c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1092,8 +1092,8 @@ config PROVE_LOCKING
select DEBUG_MUTEXES
select DEBUG_RT_MUTEXES if RT_MUTEXES
select DEBUG_LOCK_ALLOC
- select LOCKDEP_CROSSRELEASE
- select LOCKDEP_COMPLETIONS
+ select LOCKDEP_CROSSRELEASE if BROKEN
+ select LOCKDEP_COMPLETIONS if BROKEN
select TRACE_IRQFLAGS
default n
help