diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2020-06-23 01:43:23 +0200 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2020-08-14 22:05:18 -0400 |
| commit | e1cc9d8d596e233538a3ecaffea665185751db35 (patch) | |
| tree | 09e2bc4406906662d6d8602086bdd773903d2aa7 /arch | |
| parent | 6dfdf673ccb24dccc95b342235cac3e585c5af34 (diff) | |
| download | linux-e1cc9d8d596e233538a3ecaffea665185751db35.tar.gz | |
sh: switch to copy_thread_tls()
Use the copy_thread_tls() calling convention which passes tls through a
register. This is required so we can remove the copy_thread{_tls}() split
and remove the HAVE_COPY_THREAD_TLS macro.
Cc: Rich Felker <dalias@libc.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Rich Felker <dalias@libc.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/process_32.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c315cc3d7017..f86326b35b51 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -29,6 +29,7 @@ config SUPERH select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK + select HAVE_COPY_THREAD_TLS select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_KMEMLEAK select HAVE_DYNAMIC_FTRACE diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index 049f11a5f9ab..aba16af59368 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c @@ -111,8 +111,8 @@ EXPORT_SYMBOL(dump_fpu); asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void); -int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long arg, struct task_struct *p) +int copy_thread_tls(unsigned long clone_flags, unsigned long usp, + unsigned long arg, struct task_struct *p, unsigned long tls) { struct thread_info *ti = task_thread_info(p); struct pt_regs *childregs; @@ -154,7 +154,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, ti->addr_limit = USER_DS; if (clone_flags & CLONE_SETTLS) - childregs->gbr = childregs->regs[0]; + childregs->gbr = tls; childregs->regs[0] = 0; /* Set return value for child */ p->thread.pc = (unsigned long) ret_from_fork; |