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

Commit 27d892fb authored by Al Viro's avatar Al Viro
Browse files

cris: switch to generic fork/vfork/clone 



same braindamage as on s390 - the first two arguments of clone(2) in the
wrong order.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 584271bc

arch/cris/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ config CRIS 
	select MODULES_USE_ELF_RELA

	select MODULES_USE_ELF_RELA

	select GENERIC_KERNEL_THREAD

	select GENERIC_KERNEL_THREAD

	select GENERIC_KERNEL_EXECVE

	select GENERIC_KERNEL_EXECVE

	select CLONE_BACKWARDS2





config HZ

config HZ

	int

	int

arch/cris/arch-v10/kernel/process.c

+4 −28
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <arch/svinto.h>

#include <arch/svinto.h>

#include <linux/init.h>

#include <linux/init.h>

#include <arch/system.h>

#include <arch/system.h>

#include <asm/ptrace.h>

#include <linux/ptrace.h>





#ifdef CONFIG_ETRAX_GPIO

#ifdef CONFIG_ETRAX_GPIO

void etrax_gpio_wake_up_check(void); /* drivers/gpio.c */

void etrax_gpio_wake_up_check(void); /* drivers/gpio.c */
@@ -95,7 +95,7 @@ asmlinkage void ret_from_kernel_thread(void); 




int copy_thread(unsigned long clone_flags, unsigned long usp,

int copy_thread(unsigned long clone_flags, unsigned long usp,

		unsigned long arg,

		unsigned long arg,

		struct task_struct *p, struct pt_regs *regs)

		struct task_struct *p, struct pt_regs *unused)

{

{

	struct pt_regs *childregs = task_pt_regs(p);

	struct pt_regs *childregs = task_pt_regs(p);

	struct switch_stack *swstack = ((struct switch_stack *)childregs) - 1;

	struct switch_stack *swstack = ((struct switch_stack *)childregs) - 1;
@@ -115,7 +115,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
		p->thread.usp = 0;

		p->thread.usp = 0;

		return 0;

		return 0;

	}

	}

	*childregs = *regs;  /* struct copy of pt_regs */

	*childregs = *current_pt_regs();  /* struct copy of pt_regs */





        childregs->r10 = 0;  /* child returns 0 after a fork/clone */

        childregs->r10 = 0;  /* child returns 0 after a fork/clone */
@@ -129,7 +129,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
	

	

	/* fix the user-mode stackpointer */

	/* fix the user-mode stackpointer */





	p->thread.usp = usp;

	p->thread.usp = usp ?: rdusp();





	/* and the kernel-mode one */

	/* and the kernel-mode one */
@@ -143,30 +143,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
	return 0;

	return 0;

}

}





asmlinkage int sys_fork(void)

{

	return do_fork(SIGCHLD, rdusp(), current_pt_regs(), 0, NULL, NULL);

}



/* if newusp is 0, we just grab the old usp */

/* FIXME: Is parent_tid/child_tid really third/fourth argument? Update lib? */

asmlinkage int sys_clone(unsigned long newusp, unsigned long flags,

			 int* parent_tid, int* child_tid)

{

	if (!newusp)

		newusp = rdusp();

	return do_fork(flags, newusp, current_pt_regs(), 0, parent_tid, child_tid);

}



/* vfork is a system call in i386 because of register-pressure - maybe

 * we can remove it and handle it in libc but we put it here until then.

 */



asmlinkage int sys_vfork(void)

{

        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, rdusp(), current_pt_regs(), 0, NULL, NULL);

}



unsigned long get_wchan(struct task_struct *p)

unsigned long get_wchan(struct task_struct *p)

{

{

#if 0

#if 0

arch/cris/arch-v32/kernel/process.c

+5 −32
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <hwregs/reg_map.h>

#include <hwregs/reg_map.h>

#include <hwregs/timer_defs.h>

#include <hwregs/timer_defs.h>

#include <hwregs/intr_vect_defs.h>

#include <hwregs/intr_vect_defs.h>

#include <asm/ptrace.h>

#include <linux/ptrace.h>





extern void stop_watchdog(void);

extern void stop_watchdog(void);
@@ -110,7 +110,7 @@ extern asmlinkage void ret_from_kernel_thread(void); 
int

int

copy_thread(unsigned long clone_flags, unsigned long usp,

copy_thread(unsigned long clone_flags, unsigned long usp,

	unsigned long arg,

	unsigned long arg,

	struct task_struct *p, struct pt_regs *regs)

	struct task_struct *p, struct pt_regs *unused)

{

{

	struct pt_regs *childregs = task_pt_regs(p);

	struct pt_regs *childregs = task_pt_regs(p);

	struct switch_stack *swstack = ((struct switch_stack *) childregs) - 1;

	struct switch_stack *swstack = ((struct switch_stack *) childregs) - 1;
@@ -131,14 +131,14 @@ copy_thread(unsigned long clone_flags, unsigned long usp, 
		p->thread.usp = 0;

		p->thread.usp = 0;

		return 0;

		return 0;

	}

	}

	*childregs = *regs;	/* Struct copy of pt_regs. */

	*childregs = *current_pt_regs();	/* Struct copy of pt_regs. */

        childregs->r10 = 0;	/* Child returns 0 after a fork/clone. */

        childregs->r10 = 0;	/* Child returns 0 after a fork/clone. */





	/* Set a new TLS ?

	/* Set a new TLS ?

	 * The TLS is in $mof because it is the 5th argument to sys_clone.

	 * The TLS is in $mof because it is the 5th argument to sys_clone.

	 */

	 */

	if (p->mm && (clone_flags & CLONE_SETTLS)) {

	if (p->mm && (clone_flags & CLONE_SETTLS)) {

		task_thread_info(p)->tls = regs->mof;

		task_thread_info(p)->tls = childregs->mof;

	}

	}





	/* Put the switch stack right below the pt_regs. */

	/* Put the switch stack right below the pt_regs. */
@@ -153,39 +153,12 @@ copy_thread(unsigned long clone_flags, unsigned long usp, 
	swstack->return_ip = (unsigned long) ret_from_fork;

	swstack->return_ip = (unsigned long) ret_from_fork;





	/* Fix the user-mode and kernel-mode stackpointer. */

	/* Fix the user-mode and kernel-mode stackpointer. */

	p->thread.usp = usp;

	p->thread.usp = usp ?: rdusp();

	p->thread.ksp = (unsigned long) swstack;

	p->thread.ksp = (unsigned long) swstack;





	return 0;

	return 0;

}

}





asmlinkage int

sys_fork(void)

{

	return do_fork(SIGCHLD, rdusp(), current_pt_regs(), 0, NULL, NULL);

}



/* FIXME: Is parent_tid/child_tid really third/fourth argument? Update lib? */

asmlinkage int

sys_clone(unsigned long newusp, unsigned long flags, int *parent_tid, int *child_tid,

	unsigned long tls)

{

	if (!newusp)

		newusp = rdusp();



	return do_fork(flags, newusp, current_pt_regs(), 0, parent_tid, child_tid);

}



/*

 * vfork is a system call in i386 because of register-pressure - maybe

 * we can remove it and handle it in libc but we put it here until then.

 */

asmlinkage int

sys_vfork(void)

{

	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, rdusp(), current_pt_regs(), 0, NULL, NULL);

}



unsigned long

unsigned long

get_wchan(struct task_struct *p)

get_wchan(struct task_struct *p)

{

{

arch/cris/include/asm/unistd.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -372,6 +372,9 @@ 
#define __ARCH_WANT_SYS_RT_SIGACTION

#define __ARCH_WANT_SYS_RT_SIGACTION

#define __ARCH_WANT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_CLONE





/*

/*

 * "Conditional" syscalls

 * "Conditional" syscalls