diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2020-05-25 00:29:27 +0300 |
|---|---|---|
| committer | Christian Brauner <christian.brauner@ubuntu.com> | 2020-07-05 00:41:37 +0300 |
| commit | 8496da092a5350cfcc1d9c518712e7b1b3848f18 (patch) | |
| tree | 0c5c5ee213c96a86eb012ede66181089a2d6d2a6 | |
| parent | 15350c4226c7a3cdce4f2feb0fb96ed0986cf9a5 (diff) | |
| download | linux-8496da092a5350cfcc1d9c518712e7b1b3848f18.tar.xz | |
unicore: 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: Guan Xuetao <gxt@pku.edu.cn>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
| -rw-r--r-- | arch/unicore32/Kconfig | 1 | ||||
| -rw-r--r-- | arch/unicore32/kernel/process.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 11ba1839d198..01451cf500d2 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -22,6 +22,7 @@ config UNICORE32 select MODULES_USE_ELF_REL select NEED_DMA_MAP_STATE select MMU_GATHER_NO_RANGE if MMU + select HAVE_COPY_THREAD_TLS help UniCore-32 is 32-bit Instruction Set Architecture, including a series of low-power-consumption RISC chip diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c index b4fd3a604a18..49a305565a53 100644 --- a/arch/unicore32/kernel/process.c +++ b/arch/unicore32/kernel/process.c @@ -219,9 +219,9 @@ void release_thread(struct task_struct *dead_task) asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread"); -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 thread_info *thread = task_thread_info(p); struct pt_regs *childregs = task_pt_regs(p); @@ -241,7 +241,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, childregs->UCreg_sp = stack_start; if (clone_flags & CLONE_SETTLS) - childregs->UCreg_16 = childregs->UCreg_03; + childregs->UCreg_16 = tls; } return 0; } |