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/x86/um | |
| parent | b067c9045af4791a5836042f743d12477131f7b5 (diff) | |
| parent | 8a545f185145e3c09348cd74326268ecfc6715a3 (diff) | |
| download | op-kernel-dev-9e0243db6169d7d1fc39a087e78fed22a2fe7071.zip op-kernel-dev-9e0243db6169d7d1fc39a087e78fed22a2fe7071.tar.gz | |
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/x86/um')
| -rw-r--r-- | arch/x86/um/vdso/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile index 6c803ca..d72dec4 100644 --- a/arch/x86/um/vdso/Makefile +++ b/arch/x86/um/vdso/Makefile @@ -2,6 +2,9 @@ # Building vDSO images for x86. # +# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in. +KCOV_INSTRUMENT := n + VDSO64-y := y vdso-install-$(VDSO64-y) += vdso.so |
