summaryrefslogtreecommitdiffstats
path: root/arch/x86/entry/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-03 18:41:06 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-04 07:37:37 +0200
commit00398a0018d1334fedabfeaabd0fa563121de612 (patch)
tree81d6a7ccfabbf9d48126c5110678ce8de9775317 /arch/x86/entry/Makefile
parent1f57d5d85ba7f1f467173ff33f51d01a91f9aaf1 (diff)
downloadlinux-00398a0018d1334fedabfeaabd0fa563121de612.tar.bz2
x86/asm/entry: Move the vsyscall code to arch/x86/entry/vsyscall/
The vsyscall code is entry code too, so move it to arch/x86/entry/vsyscall/. 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> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Brian Gerst <brgerst@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/Makefile')
-rw-r--r--arch/x86/entry/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index 9df72c8a0ac2..b93cce1c6bb2 100644
--- a/arch/x86/entry/Makefile
+++ b/arch/x86/entry/Makefile
@@ -1,8 +1,10 @@
#
# Makefile for the x86 low level entry code
#
-obj-y := entry_$(BITS).o thunk_$(BITS).o
+obj-y := entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o
+
obj-y += vdso/
+obj-y += vsyscall/
-obj-$(CONFIG_IA32_EMULATION) += ia32entry.o
+obj-$(CONFIG_IA32_EMULATION) += ia32entry.o syscall_32.o