Commit 138bd56a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/asm/entry/64/compat: Rename ia32entry.S -> entry_64_compat.S 



So we now have the following system entry code related
files, which define the following system call instruction
and other entry paths:

   entry_32.S            # 32-bit binaries on 32-bit kernels
   entry_64.S            # 64-bit binaries on 64-bit kernels
   entry_64_compat.S	 # 32-bit binaries on 64-bit kernels

Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7a5a9824

arch/x86/entry/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ obj-y := entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o 
obj-y				+= vdso/

obj-y				+= vsyscall/



obj-$(CONFIG_IA32_EMULATION)	+= ia32entry.o syscall_32.o

obj-$(CONFIG_IA32_EMULATION)	+= entry_64_compat.o syscall_32.o

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ ENTRY(ret_from_fork) 
	/*

	 * By the time we get here, we have no idea whether our pt_regs,

	 * ti flags, and ti status came from the 64-bit SYSCALL fast path,

	 * the slow path, or one of the ia32entry paths.

	 * the slow path, or one of the 32-bit compat paths.

	 * Use IRET code path to return, since it can safely handle

	 * all of the above.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE