summaryrefslogtreecommitdiff
path: root/arch/x86/entry/entry_32.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-08 08:42:03 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-08 09:14:21 +0200
commitb2502b418e63fcde0fe1857732a476b5aa3789b1 (patch)
treef45204c8ffad5d3aa592d1277b56b41a0840f8e2 /arch/x86/entry/entry_32.S
parent4c8cd0c50d0b1559727bf0ec7ff27caeba2dfe09 (diff)
x86/asm/entry: Untangle 'system_call' into two entry points: entry_SYSCALL_64 and entry_INT80_32
The 'system_call' entry points differ starkly between native 32-bit and 64-bit kernels: on 32-bit kernels it defines the INT 0x80 entry point, while on 64-bit it's the SYSCALL entry point. This is pretty confusing when looking at generic code, and it also obscures the nature of the entry point at the assembly level. So unangle this by splitting the name into its two uses: system_call (32) -> entry_INT80_32 system_call (64) -> entry_SYSCALL_64 As per the generic naming scheme for x86 system call entry points: entry_MNEMONIC_qualifier where 'qualifier' is one of _32, _64 or _compat. 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: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/entry_32.S')
-rw-r--r--arch/x86/entry/entry_32.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index a65f46c3b8e1..d59461032625 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -415,7 +415,7 @@ sysexit_audit:
ENDPROC(entry_SYSENTER_32)
# system call handler stub
-ENTRY(system_call)
+ENTRY(entry_INT80_32)
ASM_CLAC
pushl %eax # save orig_eax
SAVE_ALL
@@ -508,7 +508,7 @@ ldt_ss:
lss (%esp), %esp /* switch to espfix segment */
jmp restore_nocheck
#endif
-ENDPROC(system_call)
+ENDPROC(entry_INT80_32)
# perform work that needs to be done immediately before resumption
ALIGN