Unverified Commit 8496da09 authored by Christian Brauner's avatar Christian Brauner
Browse files

unicore: 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: Guan Xuetao <gxt@pku.edu.cn>
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 15350c42

arch/unicore32/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ config UNICORE32 
	select MODULES_USE_ELF_REL

	select NEED_DMA_MAP_STATE

	select MMU_GATHER_NO_RANGE if MMU

	select HAVE_COPY_THREAD_TLS

	help

	  UniCore-32 is 32-bit Instruction Set Architecture,

	  including a series of low-power-consumption RISC chip

arch/unicore32/kernel/process.c

+4 −4
Original line number Diff line number Diff line
@@ -219,9 +219,9 @@ void release_thread(struct task_struct *dead_task) 
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");

asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");



int

copy_thread(unsigned long clone_flags, unsigned long stack_start,

	    unsigned long stk_sz, struct task_struct *p)

int copy_thread_tls(unsigned long clone_flags, unsigned long stack_start,

		    unsigned long stk_sz, struct task_struct *p,

		    unsigned long tls)

{

	struct thread_info *thread = task_thread_info(p);

	struct pt_regs *childregs = task_pt_regs(p);
@@ -241,7 +241,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, 
			childregs->UCreg_sp = stack_start;



		if (clone_flags & CLONE_SETTLS)

			childregs->UCreg_16 = childregs->UCreg_03;

			childregs->UCreg_16 = tls;

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE