diff options
author | 2017-06-29 14:27:39 +0200 | |
---|---|---|
committer | 2017-06-29 14:27:39 +0200 | |
commit | 61830619675b97d3da34c59c71ae51646a205e2c (patch) | |
tree | e6d39f81284bdb86ba4214c89994fb454074f583 /arch/mips/kernel/process.c | |
parent | pinctrl: armada-37xx: Fix number of pin in sdio_sb (diff) | |
parent | Linux 4.12-rc7 (diff) | |
download | wireguard-linux-61830619675b97d3da34c59c71ae51646a205e2c.tar.xz wireguard-linux-61830619675b97d3da34c59c71ae51646a205e2c.zip |
Merge tag 'v4.12-rc7' into devel
Linux 4.12-rc7
Diffstat (limited to 'arch/mips/kernel/process.c')
-rw-r--r-- | arch/mips/kernel/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 918d4c73e951..5351e1f3950d 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -120,7 +120,6 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp, struct thread_info *ti = task_thread_info(p); struct pt_regs *childregs, *regs = current_pt_regs(); unsigned long childksp; - p->set_child_tid = p->clear_child_tid = NULL; childksp = (unsigned long)task_stack_page(p) + THREAD_SIZE - 32; |