aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-04 19:37:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-04 19:37:59 -0400
commit9e0243db6169d7d1fc39a087e78fed22a2fe7071 (patch)
tree867da284894bc179e0d6f4df062e293fa5dfe85b /arch/um/os-Linux/Makefile
parentMerge branch 'parisc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff)
parenthostfs: Freeing an ERR_PTR in hostfs_fill_sb_common() (diff)
downloadlinux-dev-9e0243db6169d7d1fc39a087e78fed22a2fe7071.tar.xz
linux-dev-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/os-Linux/Makefile')
-rw-r--r--arch/um/os-Linux/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index 08ff5094fcdd..ada473bf6f46 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -3,6 +3,9 @@
# Licensed under the GPL
#
+# Don't instrument UML-specific code
+KCOV_INSTRUMENT := n
+
obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
registers.o sigio.o signal.o start_up.o time.o tty.o \
umid.o user_syms.o util.o drivers/ skas/