summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2021-08-10 11:01:42 +0200
committerThomas Gleixner <tglx@linutronix.de>2021-08-10 11:01:42 +0200
commit4b41ea606e535d47636ac4f5283834e9f6c5fa53 (patch)
tree3aca6a13a01782c5ee2de1bb1c9b14d93e95433a /lib
parentd92df42d7685445a2b6c815d9230d9699d9d400b (diff)
parentff363f480e5997051dd1de949121ffda3b753741 (diff)
downloadlinux-4b41ea606e535d47636ac4f5283834e9f6c5fa53.tar.gz
linux-4b41ea606e535d47636ac4f5283834e9f6c5fa53.tar.bz2
linux-4b41ea606e535d47636ac4f5283834e9f6c5fa53.zip
Merge branch 'irq/urgent' into irq/core
to pick up fixes on which further changes depend on.
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig3
-rw-r--r--lib/Kconfig.debug3
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index d241fe476fda..5c9c0687f76d 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -683,9 +683,6 @@ config PARMAN
config OBJAGG
tristate "objagg" if COMPILE_TEST
-config STRING_SELFTEST
- tristate "Test string functions"
-
endmenu
config GENERIC_IOREMAP
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 831212722924..5ddd575159fb 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2180,6 +2180,9 @@ config ASYNC_RAID6_TEST
config TEST_HEXDUMP
tristate "Test functions located in the hexdump module at runtime"
+config STRING_SELFTEST
+ tristate "Test string functions at runtime"
+
config TEST_STRING_HELPERS
tristate "Test functions located in the string_helpers module at runtime"