summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-15 13:01:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-15 13:01:31 -0700
commitbe5e32fc2e4b23ab443213f0c1b01cbc7ba645dc (patch)
tree1ae29cb15e2444ab046fd40aec4e1c77b07631a8
parent14db1e8dc08ca1b1ad8aa20e6ebfe0b395bbe5bf (diff)
parentef7254a595912b026d80a4116b8c4cd5b79d9c62 (diff)
downloadlinux-exynos-be5e32fc2e4b23ab443213f0c1b01cbc7ba645dc.tar.gz
linux-exynos-be5e32fc2e4b23ab443213f0c1b01cbc7ba645dc.tar.bz2
linux-exynos-be5e32fc2e4b23ab443213f0c1b01cbc7ba645dc.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build fix from Ingo Molnar: "A bzImage build fix on older distros" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/vdso: Fix 'make bzImage' on older distros
-rw-r--r--arch/x86/vdso/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 275a3a8b78af..e97032069f88 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -51,7 +51,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
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
hostprogs-y += vdso2c
quiet_cmd_vdso2c = VDSO2C $@