summaryrefslogtreecommitdiffstats
path: root/arch/x86/entry/vdso
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-11-25 09:05:09 +0100
committerIngo Molnar <mingo@kernel.org>2019-11-25 09:05:09 +0100
commitf01ec4fca8207e31b59a010c3de679c833f3a877 (patch)
tree668813e1fe0dfffa5535b7531ba6ed489c912831 /arch/x86/entry/vdso
parent45c08383141794a7e9b26f35d491b74f33ac469e (diff)
parent66584ea6b70a6cbae661292702e56a07580dbbd4 (diff)
downloadlinux-f01ec4fca8207e31b59a010c3de679c833f3a877.tar.bz2
Merge branch 'x86/build' into x86/asm, to pick up completed topic branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/vdso')
-rw-r--r--arch/x86/entry/vdso/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 0f2154106d01..2b75e80f6b41 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -87,11 +87,9 @@ $(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS
#
# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
#
-CFLAGS_REMOVE_vdso-note.o = -pg
CFLAGS_REMOVE_vclock_gettime.o = -pg
CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg
CFLAGS_REMOVE_vgetcpu.o = -pg
-CFLAGS_REMOVE_vvar.o = -pg
#
# X32 processes use x32 vDSO to access 64bit kernel data.