diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-27 20:52:32 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-04 03:33:01 +0400 |
| commit | 64b3122df48b81a40366a11f299ab819138c96e8 (patch) | |
| tree | 43c187576da8dc406c9edb8e0d3fe4e471032a53 /arch/mips | |
| parent | 974fdb3c20e72e9c0612bc038c968e420d8f9665 (diff) | |
| download | linux-64b3122df48b81a40366a11f299ab819138c96e8.tar.xz | |
mips: take the "zero newsp means inherit the parent's one" to copy_thread()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/process.c | 3 | ||||
| -rw-r--r-- | arch/mips/kernel/syscall.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 498a7ec656d8..9df3e330c37c 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -289,8 +289,6 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs) clone_flags = regs.regs[4]; newsp = regs.regs[5]; - if (!newsp) - newsp = regs.regs[29]; parent_tidptr = (int __user *) regs.regs[6]; /* Use __dummy4 instead of getting it off the stack, so that diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index a11c6f9fdd5e..a33d2ef8f273 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -156,7 +156,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, *childregs = *regs; childregs->regs[7] = 0; /* Clear error flag */ childregs->regs[2] = 0; /* Child gets zero as return value */ - childregs->regs[29] = usp; + if (usp) + childregs->regs[29] = usp; ti->addr_limit = USER_DS; p->thread.reg29 = (unsigned long) childregs; diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 7e1c70dab767..28daa66baa7b 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -86,7 +86,7 @@ save_static_function(sys_fork); static int __used noinline _sys_fork(nabi_no_regargs struct pt_regs regs) { - return do_fork(SIGCHLD, regs.regs[29], 0, NULL, NULL); + return do_fork(SIGCHLD, 0, 0, NULL, NULL); } save_static_function(sys_clone); @@ -99,8 +99,6 @@ _sys_clone(nabi_no_regargs struct pt_regs regs) clone_flags = regs.regs[4]; newsp = regs.regs[5]; - if (!newsp) - newsp = regs.regs[29]; parent_tidptr = (int __user *) regs.regs[6]; #ifdef CONFIG_32BIT /* We need to fetch the fifth argument off the stack. */ |