Merge tag 'hardening-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-block.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 5429e6f170f37e3e5a9772adf8f58d4f9e0bd665..2164f066e7b69571e2f44e0ffbf3e95125893a40 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1303,7 +1303,7 @@ config PROVE_LOCKING
        select DEBUG_SPINLOCK
        select DEBUG_MUTEXES if !PREEMPT_RT
        select DEBUG_RT_MUTEXES if RT_MUTEXES
-       select DEBUG_RWSEMS
+       select DEBUG_RWSEMS if !PREEMPT_RT
        select DEBUG_WW_MUTEX_SLOWPATH
        select DEBUG_LOCK_ALLOC
        select PREEMPT_COUNT if !ARCH_NO_PREEMPT
@@ -1426,7 +1426,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
 
 config DEBUG_RWSEMS
        bool "RW Semaphore debugging: basic checks"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && !PREEMPT_RT
        help
          This debugging feature allows mismatched rw semaphore locks
          and unlocks to be detected and reported.
@@ -2235,6 +2235,7 @@ config TEST_DIV64
 config TEST_IOV_ITER
        tristate "Test iov_iter operation" if !KUNIT_ALL_TESTS
        depends on KUNIT
+       depends on MMU
        default KUNIT_ALL_TESTS
        help
          Enable this to turn on testing of the operation of the I/O iterator
@@ -2861,28 +2862,6 @@ config TEST_MEMCAT_P
 
          If unsure, say N.
 
-config TEST_LIVEPATCH
-       tristate "Test livepatching"
-       default n
-       depends on DYNAMIC_DEBUG
-       depends on LIVEPATCH
-       depends on m
-       help
-         Test kernel livepatching features for correctness.  The tests will
-         load test modules that will be livepatched in various scenarios.
-
-         To run all the livepatching tests:
-
-         make -C tools/testing/selftests TARGETS=livepatch run_tests
-
-         Alternatively, individual tests may be invoked:
-
-         tools/testing/selftests/livepatch/test-callbacks.sh
-         tools/testing/selftests/livepatch/test-livepatch.sh
-         tools/testing/selftests/livepatch/test-shadow-vars.sh
-
-         If unsure, say N.
-
 config TEST_OBJAGG
        tristate "Perform selftest on object aggreration manager"
        default n