diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2020-01-15 18:31:37 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2020-01-15 18:31:37 +0100 |
| commit | d02e5ee09bd98b8cec9c2e26b486ed4d6d1b7e2a (patch) | |
| tree | 7cb6fa45fd1cb4bdad89c7b7832a72df893c838c /arch/um/kernel/process.c | |
| parent | 9f7a03642e0e25dc0561be124bddae2b8ed787ab (diff) | |
| parent | 24a49678f5e20f18006e71b90ac1531876b27eb1 (diff) | |
Merge branch 'i2c/for-current' into i2c/for-5.6
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 263a8f069133..17045e7211bf 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -153,8 +153,8 @@ void fork_handler(void) userspace(¤t->thread.regs.regs, current_thread_info()->aux_fp_regs); } -int copy_thread(unsigned long clone_flags, unsigned long sp, - unsigned long arg, struct task_struct * p) +int copy_thread_tls(unsigned long clone_flags, unsigned long sp, + unsigned long arg, struct task_struct * p, unsigned long tls) { void (*handler)(void); int kthread = current->flags & PF_KTHREAD; @@ -188,7 +188,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, * Set a new TLS for the child thread? */ if (clone_flags & CLONE_SETTLS) - ret = arch_copy_tls(p); + ret = arch_set_tls(p, tls); } return ret; |