Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 389c9f5..c18b45f 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -7,6 +7,8 @@ config UML
        default y
        select ARCH_EPHEMERAL_INODES
        select ARCH_HAS_KCOV
        default y
        select ARCH_EPHEMERAL_INODES
        select ARCH_HAS_KCOV

+       select ARCH_HAS_STRNCPY_FROM_USER
+       select ARCH_HAS_STRNLEN_USER

        select ARCH_NO_PREEMPT
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_SECCOMP_FILTER
        select ARCH_NO_PREEMPT
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_SECCOMP_FILTER


@@ -20,6 +22,7 @@ config UML
        select GENERIC_CPU_DEVICES
        select HAVE_GCC_PLUGINS
        select SET_FS
        select GENERIC_CPU_DEVICES
        select HAVE_GCC_PLUGINS
        select SET_FS

+       select TRACE_IRQFLAGS_SUPPORT

        select TTY # Needed for line.c
        select HAVE_ARCH_VMAP_STACK
 
        select TTY # Needed for line.c
        select HAVE_ARCH_VMAP_STACK
 


@@ -51,10 +54,6 @@ config ISA
 config SBUS
        bool
 
 config SBUS
        bool
 

-config TRACE_IRQFLAGS_SUPPORT
-       bool
-       default y
-

 config LOCKDEP_SUPPORT
        bool
        default y
 config LOCKDEP_SUPPORT
        bool
        default y