Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / um / Kconfig.common

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index cc001347544416ca4c3f7e2bca2dedca5a674a42..fd443852103c998fd997c04ee64ebb7c32716785 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -1,14 +1,17 @@
 config UML
        bool
        default y
+       select ARCH_HAS_KCOV
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_SECCOMP_FILTER
        select HAVE_UID16
        select HAVE_FUTEX_CMPXCHG if FUTEX
+       select HAVE_DEBUG_KMEMLEAK
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select GENERIC_IO
        select GENERIC_CLOCKEVENTS
+       select HAVE_GCC_PLUGINS
        select TTY # Needed for line.c
 
 config MMU
@@ -30,10 +33,9 @@ config PCI
 config PCMCIA
        bool
 
-# Yet to do!
 config TRACE_IRQFLAGS_SUPPORT
        bool
-       default n
+       default y
 
 config LOCKDEP_SUPPORT
        bool