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

parents 14db1e8d ef7254a5

arch/x86/vdso/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 $@