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>
mariux64 · Jun 4, 2015 · 00398a0 · 00398a0
1 parent 1f57d5d
commit 00398a0
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git 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
 
diff --git a/arch/x86/kernel/syscall_32.c → arch/x86/entry/syscall_32.c b/arch/x86/kernel/syscall_32.c → arch/x86/entry/syscall_32.c
diff --git a/arch/x86/kernel/syscall_64.c → arch/x86/entry/syscall_64.c b/arch/x86/kernel/syscall_64.c → arch/x86/entry/syscall_64.c
diff --git a/arch/x86/entry/vsyscall/Makefile b/arch/x86/entry/vsyscall/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the x86 low level vsyscall code
+#
+obj-y					:= vsyscall_gtod.o
+
+obj-$(CONFIG_X86_VSYSCALL_EMULATION)	+= vsyscall_64.o vsyscall_emu_64.o
+
diff --git a/arch/x86/kernel/vsyscall_64.c → arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c → arch/x86/entry/vsyscall/vsyscall_64.c
diff --git a/arch/x86/kernel/vsyscall_emu_64.S → arch/x86/entry/vsyscall/vsyscall_emu_64.S b/arch/x86/kernel/vsyscall_emu_64.S → arch/x86/entry/vsyscall/vsyscall_emu_64.S
diff --git a/arch/x86/kernel/vsyscall_gtod.c → arch/x86/entry/vsyscall/vsyscall_gtod.c b/arch/x86/kernel/vsyscall_gtod.c → arch/x86/entry/vsyscall/vsyscall_gtod.c
diff --git a/arch/x86/kernel/vsyscall_trace.h → arch/x86/entry/vsyscall/vsyscall_trace.h b/arch/x86/kernel/vsyscall_trace.h → arch/x86/entry/vsyscall/vsyscall_trace.h
@@ -24,6 +24,6 @@ TRACE_EVENT(emulate_vsyscall,
 #endif
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../arch/x86/kernel
+#define TRACE_INCLUDE_PATH ../../arch/x86/entry/vsyscall/
 #define TRACE_INCLUDE_FILE vsyscall_trace
 #include <trace/define_trace.h>
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
@@ -31,9 +31,6 @@ obj-y			+= probe_roms.o
 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
 obj-y			+= bootflag.o e820.o