Unverified Commit ad1bb82c authored by Christian Brauner's avatar Christian Brauner
Browse files

microblaze: 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: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 643d48b8

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config MICROBLAZE 
	select CPU_NO_EFFICIENT_FFS

	select MMU_GATHER_NO_RANGE if MMU

	select SPARSE_IRQ

	select HAVE_COPY_THREAD_TLS



# Endianness selection

choice

arch/microblaze/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ void flush_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 pt_regs *childregs = task_pt_regs(p);

	struct thread_info *ti = task_thread_info(p);
@@ -114,7 +114,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
	 *  which contains TLS area

	 */

	if (clone_flags & CLONE_SETTLS)

		childregs->r21 = childregs->r10;

		childregs->r21 = tls;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE