diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 19:37:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 19:37:59 -0400 |
commit | 9e0243db6169d7d1fc39a087e78fed22a2fe7071 (patch) | |
tree | 867da284894bc179e0d6f4df062e293fa5dfe85b /arch/um/Kconfig.common | |
parent | b067c9045af4791a5836042f743d12477131f7b5 (diff) | |
parent | 8a545f185145e3c09348cd74326268ecfc6715a3 (diff) | |
download | blackbird-op-linux-9e0243db6169d7d1fc39a087e78fed22a2fe7071.tar.gz blackbird-op-linux-9e0243db6169d7d1fc39a087e78fed22a2fe7071.zip |
Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
"Beside of various fixes this also contains patches to enable features
such was Kcov, kmemleak and TRACE_IRQFLAGS_SUPPORT on UML"
* 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
hostfs: Freeing an ERR_PTR in hostfs_fill_sb_common()
um: Support kcov
um: Enable TRACE_IRQFLAGS_SUPPORT
um: Use asm-generic/irqflags.h
um: Fix possible deadlock in sig_handler_common()
um: Select HAVE_DEBUG_KMEMLEAK
um: Setup physical memory in setup_arch()
um: Eliminate null test after alloc_bootmem
Diffstat (limited to 'arch/um/Kconfig.common')
-rw-r--r-- | arch/um/Kconfig.common | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index 58650d098fb4..fd443852103c 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common @@ -1,10 +1,12 @@ 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 @@ -31,10 +33,9 @@ config PCI config PCMCIA bool -# Yet to do! config TRACE_IRQFLAGS_SUPPORT bool - default n + default y config LOCKDEP_SUPPORT bool |