diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-26 11:54:27 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 11:54:27 +0200 |
| commit | 3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (patch) | |
| tree | 81e5823a1c84a0131dc110f711f3c1416b4df985 /arch/mips/kernel | |
| parent | Merge branch 'perf/updates' into aarch64/for-next/core (diff) | |
| parent | acpi: apei: check for pending errors when probing GHES entries (diff) | |
| download | linux-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.tar.xz linux-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.zip | |
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
Diffstat (limited to 'arch/mips/kernel')
| -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; |