Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / x86 / entry / vdso / Makefile

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 5a1993905acef98c8b1fce42df86230657d4cbff..93216b5ab790b2c71267358e0f6aedc452784a9c 100644 (file)
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -3,8 +3,9 @@
 #
 
 KBUILD_CFLAGS += $(DISABLE_LTO)
-KASAN_SANITIZE := n
-UBSAN_SANITIZE := n
+KASAN_SANITIZE                 := n
+UBSAN_SANITIZE                 := n
+OBJECT_FILES_NON_STANDARD      := y
 # Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
 KCOV_INSTRUMENT := n
 
@@ -18,6 +19,7 @@ vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o
 
 # files to link into kernel
 obj-y                          += vma.o
+OBJECT_FILES_NON_STANDARD_vma.o        := n
 
 # vDSO images to build
 vdso_img-$(VDSO64-y)           += 64