Commit 9d3fbb5d authored by Miles Bader's avatar Miles Bader Committed by Arnaldo Carvalho de Melo

[PATCH] Handle new do_fork return value on v850

parent 50a94e1a
......@@ -557,7 +557,10 @@ L_ENTRY(sys_fork_wrapper):
addi SIGCHLD, r0, r6 // Arg 0: flags
ld.w PTO+PT_GPR(GPR_SP)[sp], r7 // Arg 1: child SP (use parent's)
movea PTO, sp, r8 // Arg 2: parent context
mov hilo(CSYM(fork_common)), r18// Where the real work gets done
mov r0, r9 // Arg 3/4/5: 0
st.w r0, 16[sp]
st.w r0, 20[sp]
mov hilo(CSYM(do_fork)), r18 // Where the real work gets done
br save_extra_state_tramp // Save state and go there
#else
// fork almost works, enough to trick you into looking elsewhere :-(
......@@ -570,16 +573,22 @@ L_ENTRY(sys_vfork_wrapper):
addi CLONE_VFORK | CLONE_VM | SIGCHLD, r0, r6 // Arg 0: flags
ld.w PTO+PT_GPR(GPR_SP)[sp], r7 // Arg 1: child SP (use parent's)
movea PTO, sp, r8 // Arg 2: parent context
mov hilo(CSYM(fork_common)), r18// Where the real work gets done
mov r0, r9 // Arg 3/4/5: 0
st.w r0, 16[sp]
st.w r0, 20[sp]
mov hilo(CSYM(do_fork)), r18 // Where the real work gets done
br save_extra_state_tramp // Save state and go there
END(sys_vfork_wrapper)
L_ENTRY(sys_clone_wrapper):
ld.w PTO+PT_GPR(GPR_SP)[sp], r19 // parent's stack pointer
ld.w PTO+PT_GPR(GPR_SP)[sp], r19// parent's stack pointer
cmp r7, r0 // See if child SP arg (arg 1) is 0.
cmov z, r19, r7, r7 // ... and use the parent's if so.
movea PTO, sp, r8 // Arg 2: parent context
mov hilo(CSYM(fork_common)), r18// Where the real work gets done
mov r0, r9 // Arg 3/4/5: 0
st.w r0, 16[sp]
st.w r0, 20[sp]
mov hilo(CSYM(do_fork)), r18 // Where the real work gets done
br save_extra_state_tramp // Save state and go there
END(sys_clone_wrapper)
......
......@@ -200,14 +200,6 @@ int sys_execve (char *name, char **argv, char **envp, struct pt_regs *regs)
return error;
}
/* This is the common part of the various fork-like system calls (which
are in entry.S). */
int fork_common (int flags, unsigned long new_sp, struct pt_regs *regs)
{
struct task_struct *p = do_fork (flags, new_sp, regs, 0, 0, 0);
return IS_ERR (p) ? PTR_ERR (p) : p->pid;
}
/*
* These bracket the sleeping functions..
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment