diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:43:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:43:44 +0100 |
| commit | cb6c82df684e912b10245c13200ef09c9d372fc2 (patch) | |
| tree | 98448cea990ecf17ad39798980ab18165b72b7ac /arch/arm/kernel | |
| parent | 5738891229a25e9e678122a843cbf0466a456d0c (diff) | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
| download | lwn-cb6c82df684e912b10245c13200ef09c9d372fc2.tar.gz lwn-cb6c82df684e912b10245c13200ef09c9d372fc2.zip | |
Merge tag 'v5.5-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index cea1c27c29cb..46e478fb5ea2 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -226,8 +226,8 @@ void release_thread(struct task_struct *dead_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) +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); @@ -261,7 +261,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, clear_ptrace_hw_breakpoint(p); if (clone_flags & CLONE_SETTLS) - thread->tp_value[0] = childregs->ARM_r3; + thread->tp_value[0] = tls; thread->tp_value[1] = get_tpuser(); thread_notify(THREAD_NOTIFY_COPY, thread); |