summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/proto.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-08 09:33:56 +0300
committerIngo Molnar <mingo@kernel.org>2015-06-08 09:47:46 +0300
commit4c8cd0c50d0b1559727bf0ec7ff27caeba2dfe09 (patch)
treebd477ba39b3ee39b9f6ecf64bfc74a602fa27d60 /arch/x86/include/asm/proto.h
parent2cd23553b488589f287457b7396470f5e3c40698 (diff)
downloadlinux-4c8cd0c50d0b1559727bf0ec7ff27caeba2dfe09.tar.xz
x86/asm/entry: Untangle 'ia32_sysenter_target' into two entry points: entry_SYSENTER_32 and entry_SYSENTER_compat
So the SYSENTER instruction is pretty quirky and it has different behavior depending on bitness and CPU maker. Yet we create a false sense of coherency by naming it 'ia32_sysenter_target' in both of the cases. Split the name into its two uses: ia32_sysenter_target (32) -> entry_SYSENTER_32 ia32_sysenter_target (64) -> entry_SYSENTER_compat 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/include/asm/proto.h')
-rw-r--r--arch/x86/include/asm/proto.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h
index 7d2961a231f1..83a7f8227949 100644
--- a/arch/x86/include/asm/proto.h
+++ b/arch/x86/include/asm/proto.h
@@ -10,7 +10,8 @@ void syscall_init(void);
void entry_INT80_compat(void);
void entry_SYSCALL_compat(void);
-void ia32_sysenter_target(void);
+void entry_SYSENTER_32(void);
+void entry_SYSENTER_compat(void);
void x86_configure_nx(void);
void x86_report_nx(void);