diff options
| author |  James Cowgill <James.Cowgill@imgtec.com>
| 2017-03-31 17:09:58 +0100 |
|---|---|---|
| committer |  Ralf Baechle <ralf@linux-mips.org>
| 2017-04-12 13:52:21 +0200 |
| commit | f9c4e3a6dae1a3a15055ea478438cdc0352e1af2 (patch) | |
| tree | 06fa77cb9876b229cdd181fac3ff97e17740df22 /arch/mips | |
| parent | CPUFREQ: Loongson2: drop set_cpus_allowed_ptr() (diff) | |
| download | linux-f9c4e3a6dae1a3a15055ea478438cdc0352e1af2.tar.gz linux-f9c4e3a6dae1a3a15055ea478438cdc0352e1af2.tar.bz2 linux-f9c4e3a6dae1a3a15055ea478438cdc0352e1af2.zip | |
MIPS: Opt into HAVE_COPY_THREAD_TLS
This the mips version of commit c1bd55f922a2d ("x86: opt into
HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit").
Simply use the tls system call argument instead of extracting the tls
argument by magic from the pt_regs structure.
See commit 3033f14ab78c3 ("clone: support passing tls argument via C
rather than pt_regs magic") for more background.
Signed-off-by: James Cowgill <James.Cowgill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15855/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mips/kernel/process.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 2afb41c52ba0..52d81ca6f74e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -70,6 +70,7 @@ config MIPS select HAVE_EXIT_THREAD select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_ARCH_HARDENED_USERCOPY + select HAVE_COPY_THREAD_TLS menu "Machine selection" diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index b68e10fc453d..918d4c73e951 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -114,8 +114,8 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) /* * Copy architecture-specific thread state */ -int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long kthread_arg, struct task_struct *p) +int copy_thread_tls(unsigned long clone_flags, unsigned long usp, + unsigned long kthread_arg, struct task_struct *p, unsigned long tls) { struct thread_info *ti = task_thread_info(p); struct pt_regs *childregs, *regs = current_pt_regs(); @@ -176,7 +176,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, atomic_set(&p->thread.bd_emu_frame, BD_EMUFRAME_NONE); if (clone_flags & CLONE_SETTLS) - ti->tp_value = regs->regs[7]; + ti->tp_value = tls; return 0; } |