Merge tag 'asm-generic-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[linux-2.6-microblaze.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 5c9c068..5e7165e 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -50,12 +50,18 @@ config HAVE_ARCH_BITREVERSE
          This option enables the use of hardware bit-reversal instructions on
          architectures which support such operations.
 
-config GENERIC_STRNCPY_FROM_USER
+config ARCH_HAS_STRNCPY_FROM_USER
        bool
 
-config GENERIC_STRNLEN_USER
+config ARCH_HAS_STRNLEN_USER
        bool
 
+config GENERIC_STRNCPY_FROM_USER
+       def_bool !ARCH_HAS_STRNCPY_FROM_USER
+
+config GENERIC_STRNLEN_USER
+       def_bool !ARCH_HAS_STRNLEN_USER
+
 config GENERIC_NET_UTILS
        bool