From 68cbcba7fd5d2c2b374e64a31d51d737ce4020eb Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Fri, 13 Feb 2009 23:58:29 +0100 Subject: [PATCH] --- yaml --- r: 140035 b: refs/heads/master c: 803094f480aa5b7dd5187a17e6e60ff24721c212 h: refs/heads/master i: 140033: 685814fc69ba38a74ac7824eb8c44bd8cfb57036 140031: c7c9efaf6cf9201b35104eeafb3c21b4af3a27b6 v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/process.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 99fae8101c2e..643d099d283d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 548f1176f0ac637eff895defb715ce6fde7c460a +refs/heads/master: 803094f480aa5b7dd5187a17e6e60ff24721c212 diff --git a/trunk/arch/parisc/kernel/process.c b/trunk/arch/parisc/kernel/process.c index b80e02a4d81d..ad585fd7748e 100644 --- a/trunk/arch/parisc/kernel/process.c +++ b/trunk/arch/parisc/kernel/process.c @@ -231,8 +231,8 @@ sys_clone(unsigned long clone_flags, unsigned long usp, However, these last 3 args are only examined if the proper flags are set. */ - int __user *child_tidptr; - int __user *parent_tidptr; + int __user *parent_tidptr = (int __user *)regs->gr[24]; + int __user *child_tidptr = (int __user *)regs->gr[22]; /* usp must be word aligned. This also prevents users from * passing in the value 1 (which is the signal for a special @@ -243,16 +243,6 @@ sys_clone(unsigned long clone_flags, unsigned long usp, if (usp == 0) usp = regs->gr[30]; - if (clone_flags & CLONE_PARENT_SETTID) - parent_tidptr = (int __user *)regs->gr[24]; - else - parent_tidptr = NULL; - - if (clone_flags & (CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)) - child_tidptr = (int __user *)regs->gr[22]; - else - child_tidptr = NULL; - return do_fork(clone_flags, usp, regs, 0, parent_tidptr, child_tidptr); }