summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2015-03-03 22:31:33 -0500
committerIngo Molnar <mingo@kernel.org>2015-03-04 06:16:21 +0100
commit2aa4a710928863e84cb71e60b7c839d12403f5ca (patch)
tree867a6a4e3f37aa73efd572a7c9790f7c56a410fb /arch/x86/kernel/Makefile
parent29a5ff97fa0d8045d262a772c3853e3ef1ed98d8 (diff)
downloadblackbird-op-linux-2aa4a710928863e84cb71e60b7c839d12403f5ca.tar.gz
blackbird-op-linux-2aa4a710928863e84cb71e60b7c839d12403f5ca.zip
x86/compat: Merge native and compat 32-bit syscall tables
Combine the 32-bit syscall tables into one file. Signed-off-by: Brian Gerst <brgerst@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1425439896-8322-3-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r--arch/x86/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 5d4502c8b983..62fbe7177cdd 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_X86_32) += i386_ksyms_32.o
obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
obj-$(CONFIG_X86_64) += mcount_64.o
obj-y += syscall_$(BITS).o vsyscall_gtod.o
+obj-$(CONFIG_IA32_EMULATION) += syscall_32.o
obj-$(CONFIG_X86_VSYSCALL_EMULATION) += vsyscall_64.o vsyscall_emu_64.o
obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o
obj-$(CONFIG_SYSFS) += ksysfs.o
OpenPOWER on IntegriCloud