Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9febc915 authored by Vineet Gupta's avatar Vineet Gupta Committed by Greg Kroah-Hartman
Browse files

ARC: wireup clone3 syscall 



commit bd71c453db91ecb464405411f2821d040f2a0d44 upstream.

Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 417b11d3

arch/arc/Kconfig

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

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_IOREMAP_PROT

arch/arc/include/asm/syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/types.h>



int sys_clone_wrapper(int, int, int, int, int);

int sys_clone3_wrapper(void *, size_t);

int sys_cacheflush(uint32_t, uint32_t uint32_t);

int sys_arc_settls(void *);

int sys_arc_gettls(void);

arch/arc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_CLONE3

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS

arch/arc/kernel/entry.S

+12 −0
Original line number Diff line number Diff line
@@ -35,6 +35,18 @@ ENTRY(sys_clone_wrapper) 
	b .Lret_from_system_call

END(sys_clone_wrapper)



ENTRY(sys_clone3_wrapper)

	SAVE_CALLEE_SAVED_USER

	bl  @sys_clone3

	DISCARD_CALLEE_SAVED_USER



	GET_CURR_THR_INFO_FLAGS   r10

	btst r10, TIF_SYSCALL_TRACE

	bnz  tracesys_exit



	b .Lret_from_system_call

END(sys_clone3_wrapper)



ENTRY(ret_from_fork)

	; when the forked child comes here from the __switch_to function

	; r0 has the last task pointer.

arch/arc/kernel/process.c

+3 −4
Original line number Diff line number Diff line
@@ -171,9 +171,8 @@ asmlinkage void ret_from_fork(void); 
 * |    user_r25    |

 * ------------------  <===== END of PAGE

 */

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 pt_regs *c_regs;        /* child's pt_regs */

	unsigned long *childksp;       /* to unwind out of __switch_to() */
@@ -231,7 +230,7 @@ int copy_thread(unsigned long clone_flags, 
		 * set task's userland tls data ptr from 4th arg

		 * clone C-lib call is difft from clone sys-call

		 */

		task_thread_info(p)->thr_ptr = regs->r3;

		task_thread_info(p)->thr_ptr = tls;

	} else {

		/* Normal fork case: set parent's TLS ptr in child */

		task_thread_info(p)->thr_ptr =