diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2020-05-24 23:15:53 +0200 |
|---|---|---|
| committer | Christian Brauner <christian.brauner@ubuntu.com> | 2020-07-04 23:41:36 +0200 |
| commit | 643d48b8e6e71a77214c8653003f2ecd9bc10f9e (patch) | |
| tree | 54ab8689f015803fa36857754d1df02551fc5fa4 | |
| parent | e0daa22c292b5835a946716b9a2092b30c7d9d31 (diff) | |
| download | linux-stable-643d48b8e6e71a77214c8653003f2ecd9bc10f9e.tar.gz linux-stable-643d48b8e6e71a77214c8653003f2ecd9bc10f9e.tar.bz2 linux-stable-643d48b8e6e71a77214c8653003f2ecd9bc10f9e.zip | |
hexagon: switch to copy_thread_tls()
Use the copy_thread_tls() calling convention which passes tls through a
register. This is required so we can remove the copy_thread{_tls}() split
and remove the HAVE_COPY_THREAD_TLS macro.
Cc: linux-hexagon@vger.kernel.org
Acked-by: Brian Cain <bcain@codeaurora.org>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
| -rw-r--r-- | arch/hexagon/Kconfig | 1 | ||||
| -rw-r--r-- | arch/hexagon/kernel/process.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 667cfc511cf9..19bc2f2ee331 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -31,6 +31,7 @@ config HEXAGON select GENERIC_CLOCKEVENTS_BROADCAST select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES + select HAVE_COPY_THREAD_TLS help Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications. diff --git a/arch/hexagon/kernel/process.c b/arch/hexagon/kernel/process.c index ac07f5f4b76b..d756f9556dd7 100644 --- a/arch/hexagon/kernel/process.c +++ b/arch/hexagon/kernel/process.c @@ -50,8 +50,8 @@ void arch_cpu_idle(void) /* * Copy architecture-specific thread state */ -int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long arg, struct task_struct *p) +int copy_thread_tls(unsigned long clone_flags, unsigned long usp, + unsigned long arg, struct task_struct *p, unsigned long tls) { struct thread_info *ti = task_thread_info(p); struct hexagon_switch_stack *ss; @@ -100,7 +100,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, * ugp is used to provide TLS support. */ if (clone_flags & CLONE_SETTLS) - childregs->ugp = childregs->r04; + childregs->ugp = tls; /* * Parent sees new pid -- not necessary, not even possible at |