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

[platform/kernel/linux-starfive.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1b2bdc0..6831b79 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2234,9 +2234,6 @@ config STRING_SELFTEST
 config TEST_STRING_HELPERS
        tristate "Test functions located in the string_helpers module at runtime"
 
-config TEST_STRSCPY
-       tristate "Test strscpy*() family of functions at runtime"
-
 config TEST_KSTRTOX
        tristate "Test kstrto*() family of functions at runtime"
 
@@ -2271,15 +2268,6 @@ config TEST_RHASHTABLE
 
          If unsure, say N.
 
-config TEST_SIPHASH
-       tristate "Perform selftest on siphash functions"
-       help
-         Enable this option to test the kernel's siphash (<linux/siphash.h>) hash
-         functions on boot (or module load).
-
-         This is intended to help people writing architecture-specific
-         optimized versions.  If unsure, say N.
-
 config TEST_IDA
        tristate "Perform selftest on IDA functions"
 
@@ -2607,6 +2595,22 @@ config HW_BREAKPOINT_KUNIT_TEST
 
          If unsure, say N.
 
+config STRSCPY_KUNIT_TEST
+       tristate "Test strscpy*() family of functions at runtime" if !KUNIT_ALL_TESTS
+       depends on KUNIT
+       default KUNIT_ALL_TESTS
+
+config SIPHASH_KUNIT_TEST
+       tristate "Perform selftest on siphash functions" if !KUNIT_ALL_TESTS
+       depends on KUNIT
+       default KUNIT_ALL_TESTS
+       help
+         Enable this option to test the kernel's siphash (<linux/siphash.h>) hash
+         functions on boot (or module load).
+
+         This is intended to help people writing architecture-specific
+         optimized versions.  If unsure, say N.
+
 config TEST_UDELAY
        tristate "udelay test driver"
        help