summaryrefslogtreecommitdiffstats
path: root/arch/x86/vdso/Makefile
diff options
context:
space:
mode:
authorJeremy Fitzhardinge2008-07-12 11:22:00 +0200
committerIngo Molnar2008-07-16 11:08:27 +0200
commit6a52e4b1cddd90fbfde8fb67021657936ee74b07 (patch)
treec876e1fafe89169f373f6b04739242b5d646fcf7 /arch/x86/vdso/Makefile
parentx86, xen, vdso: fix build error (diff)
downloadkernel-qcow2-linux-6a52e4b1cddd90fbfde8fb67021657936ee74b07.tar.gz
kernel-qcow2-linux-6a52e4b1cddd90fbfde8fb67021657936ee74b07.tar.xz
kernel-qcow2-linux-6a52e4b1cddd90fbfde8fb67021657936ee74b07.zip
x86_64: further cleanup of 32-bit compat syscall mechanisms
AMD only supports "syscall" from 32-bit compat usermode. Intel and Centaur(?) only support "sysenter" from 32-bit compat usermode. Set the X86 feature bits accordingly, and set up the vdso in accordance with those bits. On the offchance we run on in a 64-bit environment which supports neither syscall nor sysenter from 32-bit mode, then fall back to the int $0x80 vdso. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/vdso/Makefile')
-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 b7ad9f89d21f..4d6ef0a336d6 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -62,7 +62,7 @@ $(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
# Build multiple 32-bit vDSO images to choose from at boot time.
#
obj-$(VDSO32-y) += vdso32-syms.lds
-vdso32.so-$(CONFIG_X86_32) += int80
+vdso32.so-$(VDSO32-y) += int80
vdso32.so-$(CONFIG_COMPAT) += syscall
vdso32.so-$(VDSO32-y) += sysenter