瀏覽代碼

parisc: simplify sys_clone()

No need to test clone_flags here and set parent_tidptr and child_tidptr
accordingly. The same check will be done in do_fork() and copy_process() anyway.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Helge Deller 16 年之前
父節點
當前提交
803094f480
共有 1 個文件被更改,包括 2 次插入12 次删除
  1. 2 12
      arch/parisc/kernel/process.c

+ 2 - 12
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
 	   However, these last 3 args are only examined
 	   if the proper flags are set. */
 	   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
 	/* usp must be word aligned.  This also prevents users from
 	 * passing in the value 1 (which is the signal for a special
 	 * 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)
 	if (usp == 0)
 	  usp = regs->gr[30];
 	  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);
 	return do_fork(clone_flags, usp, regs, 0, parent_tidptr, child_tidptr);
 }
 }