aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2015-06-22 07:55:13 -0400
committerIngo Molnar <mingo@kernel.org>2015-07-06 09:28:56 -0400
commit7da770785f9740af1cb24b8fd63075543bd00711 (patch)
treefe338adaccec1a3ebe57a89fac6d4bd30a59e4ed
parentb829d1be20ab51a3b76ec003118c9260d1fa424e (diff)
x86/compat: Rename 'start_thread_ia32' to 'compat_start_thread'
This function is shared between the 32-bit compat and x32 ABIs. Signed-off-by: Brian Gerst <brgerst@gmail.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> 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> Link: http://lkml.kernel.org/r/1434974121-32575-5-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/include/asm/elf.h4
-rw-r--r--arch/x86/kernel/process_64.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 180b6fe8aed3..2bf67c0e9339 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -187,8 +187,8 @@ static inline void elf_common_init(struct thread_struct *t,
187#define COMPAT_ELF_PLAT_INIT(regs, load_addr) \ 187#define COMPAT_ELF_PLAT_INIT(regs, load_addr) \
188 elf_common_init(&current->thread, regs, __USER_DS) 188 elf_common_init(&current->thread, regs, __USER_DS)
189 189
190void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp); 190void compat_start_thread(struct pt_regs *regs, u32 new_ip, u32 new_sp);
191#define compat_start_thread start_thread_ia32 191#define compat_start_thread compat_start_thread
192 192
193void set_personality_ia32(bool); 193void set_personality_ia32(bool);
194#define COMPAT_SET_PERSONALITY(ex) \ 194#define COMPAT_SET_PERSONALITY(ex) \
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 71d7849a07f7..0831ba3bcf95 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -248,8 +248,8 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
248 __USER_CS, __USER_DS, 0); 248 __USER_CS, __USER_DS, 0);
249} 249}
250 250
251#ifdef CONFIG_IA32_EMULATION 251#ifdef CONFIG_COMPAT
252void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp) 252void compat_start_thread(struct pt_regs *regs, u32 new_ip, u32 new_sp)
253{ 253{
254 start_thread_common(regs, new_ip, new_sp, 254 start_thread_common(regs, new_ip, new_sp,
255 test_thread_flag(TIF_X32) 255 test_thread_flag(TIF_X32)