Commit e1cc9d8d authored by Christian Brauner's avatar Christian Brauner Committed by Rich Felker
Browse files

sh: 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: Rich Felker <dalias@libc.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: linux-sh@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent 6dfdf673

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config SUPERH 
	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE

arch/sh/kernel/process_32.c

+3 −3
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ EXPORT_SYMBOL(dump_fpu); 
asmlinkage void ret_from_fork(void);

asmlinkage void ret_from_kernel_thread(void);



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 pt_regs *childregs;
@@ -154,7 +154,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
	ti->addr_limit = USER_DS;



	if (clone_flags & CLONE_SETTLS)

		childregs->gbr = childregs->regs[0];

		childregs->gbr = tls;



	childregs->regs[0] = 0; /* Set return value for child */

	p->thread.pc = (unsigned long) ret_from_fork;

CRA Git | Maintained and supported by SUSTech CRA and CCSE