summaryrefslogtreecommitdiffstats
path: root/arch/x86/entry
diff options
context:
space:
mode:
authorIngo Molnar2016-07-25 19:48:41 +0200
committerIngo Molnar2016-07-25 19:48:41 +0200
commit674d2d69b14f677a771ceec4b48bfade94a0c5f1 (patch)
tree1413429fd703b57aaf9f5b7fdab4b283b32b13cd /arch/x86/entry
parentMerge tag 'perf-core-for-mingo-20160718' of git://git.kernel.org/pub/scm/linu... (diff)
parentRevert "perf tools: event.h needs asm/perf_regs.h" (diff)
downloadkernel-qcow2-linux-674d2d69b14f677a771ceec4b48bfade94a0c5f1.tar.gz
kernel-qcow2-linux-674d2d69b14f677a771ceec4b48bfade94a0c5f1.tar.xz
kernel-qcow2-linux-674d2d69b14f677a771ceec4b48bfade94a0c5f1.zip
Merge tag 'perf-core-for-mingo-20160725' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: - Add AVX-512 support to the instruction decoder, used by Intel PT, fix vcvtph2ps instruction decoding (Adrian Hunter) - Make objtool and vdso2c use the right arch header search path (Stephen Rothwell, Josh Poimboeuf, Arnaldo Carvalho de Melo) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
-rw-r--r--arch/x86/entry/vdso/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 253b72eaade6..25e88c030c47 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -55,7 +55,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
hostprogs-y += vdso2c
quiet_cmd_vdso2c = VDSO2C $@