diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2020-05-24 23:20:53 +0200 |
|---|---|---|
| committer | Christian Brauner <christian.brauner@ubuntu.com> | 2020-07-04 23:41:37 +0200 |
| commit | 1dd966ea63f46b82ae9e367de22e3f8c70450fd5 (patch) | |
| tree | 3f9a962400eedf9e033901e481e107dee09e5dee /arch/nds32 | |
| parent | ad1bb82c057ecebfdb0b619e023c57b425ef7e7e (diff) | |
nds32: 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: Greentime Hu <green.hu@gmail.com>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Diffstat (limited to 'arch/nds32')
| -rw-r--r-- | arch/nds32/Kconfig | 1 | ||||
| -rw-r--r-- | arch/nds32/kernel/process.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig index e30298e99e1b..7b6eaca81cce 100644 --- a/arch/nds32/Kconfig +++ b/arch/nds32/Kconfig @@ -48,6 +48,7 @@ config NDS32 select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE + select HAVE_COPY_THREAD_TLS help Andes(nds32) Linux support. diff --git a/arch/nds32/kernel/process.c b/arch/nds32/kernel/process.c index 9712fd474f2c..7dbb1bf64165 100644 --- a/arch/nds32/kernel/process.c +++ b/arch/nds32/kernel/process.c @@ -149,8 +149,9 @@ void flush_thread(void) DEFINE_PER_CPU(struct task_struct *, __entry_task); asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); -int copy_thread(unsigned long clone_flags, unsigned long stack_start, - unsigned long stk_sz, struct task_struct *p) +int copy_thread_tls(unsigned long clone_flags, unsigned long stack_start, + unsigned long stk_sz, struct task_struct *p, + unsigned long tls) { struct pt_regs *childregs = task_pt_regs(p); @@ -170,7 +171,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, childregs->uregs[0] = 0; childregs->osp = 0; if (clone_flags & CLONE_SETTLS) - childregs->uregs[25] = childregs->uregs[3]; + childregs->uregs[25] = tls; } /* cpu context switching */ p->thread.cpu_context.pc = (unsigned long)ret_from_fork; |