From b4b541a610c4db8643b36030ee5012203ca65778 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Mon, 17 Mar 2014 23:22:08 +0100 Subject: x86, vdso: Patch alternatives in the 32-bit VDSO We need the alternatives mechanism for rdtsc_barrier() to work. Signed-off-by: Stefani Seibold Link: http://lkml.kernel.org/r/1395094933-14252-9-git-send-email-stefani@seibold.net Signed-off-by: H. Peter Anvin --- arch/x86/vdso/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/x86/vdso/Makefile') diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index fd14be1d147..7a3d13e23f2 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile @@ -21,7 +21,8 @@ vobjs-$(VDSOX32-y) += $(vobjx32s-compat) vobj64s := $(filter-out $(vobjx32s-compat),$(vobjs-y)) # files to link into kernel -obj-$(VDSO64-y) += vma.o vdso.o +obj-y += vma.o +obj-$(VDSO64-y) += vdso.o obj-$(VDSOX32-y) += vdsox32.o obj-$(VDSO32-y) += vdso32.o vdso32-setup.o -- cgit v1.2.3-70-g09d2