flagday: kill pt_regs argument of do_fork()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 582276e..3e16ad9 100644 (file)
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -135,7 +135,7 @@ asmlinkage int bfin_clone(unsigned long clone_flags, unsigned long newsp)
 #endif
        if (newsp)
                newsp -= 12;
-       return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
+       return do_fork(clone_flags, newsp, 0, NULL, NULL);
 }
 
 int

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 940a672..e25b784 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -116,13 +116,12 @@ GLOBAL_ENTRY(sys_clone2)
        mov loc1=r16                            // save ar.pfs across do_fork
        .body
        mov out1=in1
-       mov out3=in2
+       mov out2=in2
        tbit.nz p6,p0=in0,CLONE_SETTLS_BIT
-       mov out4=in3    // parent_tidptr: valid only w/CLONE_PARENT_SETTID
+       mov out3=in3    // parent_tidptr: valid only w/CLONE_PARENT_SETTID
        ;;
 (p6)   st8 [r2]=in5                            // store TLS in r16 for copy_thread()
-       mov out5=in4    // child_tidptr:  valid only w/CLONE_CHILD_SETTID or CLONE_CHILD_CLEARTID
-       adds out2=IA64_SWITCH_STACK_SIZE+16,sp  // out2 = &regs
+       mov out4=in4    // child_tidptr:  valid only w/CLONE_CHILD_SETTID or CLONE_CHILD_CLEARTID
        mov out0=in0                            // out0 = clone_flags
        br.call.sptk.many rp=do_fork
 .ret1: .restore sp
@@ -148,13 +147,12 @@ GLOBAL_ENTRY(sys_clone)
        mov loc1=r16                            // save ar.pfs across do_fork
        .body
        mov out1=in1
-       mov out3=16                             // stacksize (compensates for 16-byte scratch area)
+       mov out2=16                             // stacksize (compensates for 16-byte scratch area)
        tbit.nz p6,p0=in0,CLONE_SETTLS_BIT
-       mov out4=in2    // parent_tidptr: valid only w/CLONE_PARENT_SETTID
+       mov out3=in2    // parent_tidptr: valid only w/CLONE_PARENT_SETTID
        ;;
 (p6)   st8 [r2]=in4                            // store TLS in r13 (tp)
-       mov out5=in3    // child_tidptr:  valid only w/CLONE_CHILD_SETTID or CLONE_CHILD_CLEARTID
-       adds out2=IA64_SWITCH_STACK_SIZE+16,sp  // out2 = &regs
+       mov out4=in3    // child_tidptr:  valid only w/CLONE_CHILD_SETTID or CLONE_CHILD_CLEARTID
        mov out0=in0                            // out0 = clone_flags
        br.call.sptk.many rp=do_fork
 .ret2: .restore sp

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 9a3df4d..d538694 100644 (file)
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -149,7 +149,7 @@ void flush_thread(void)
 asmlinkage int m68k_clone(struct pt_regs *regs)
 {
        /* regs will be equal to current_pt_regs() */
-       return do_fork(regs->d1, regs->d2, regs, 0,
+       return do_fork(regs->d1, regs->d2, 0,
                       (int __user *)regs->d3, (int __user *)regs->d4);
 }
 

diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 8796dbc..7adab86 100644 (file)
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -312,7 +312,7 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs)
        /* Use __dummy4 instead of getting it off the stack, so that
           syscall() works.  */
        child_tidptr = (int __user *) __dummy4;
-       return do_fork(clone_flags, newsp, &regs, 0,
+       return do_fork(clone_flags, newsp, 0,
                       parent_tidptr, child_tidptr);
 }
 

diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index c611e2d..201cb76 100644 (file)
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -92,7 +92,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], &regs, 0, NULL, NULL);
+       return do_fork(SIGCHLD, regs.regs[29], 0, NULL, NULL);
 }
 
 save_static_function(sys_clone);
@@ -123,7 +123,7 @@ _sys_clone(nabi_no_regargs struct pt_regs regs)
 #else
        child_tidptr = (int __user *) regs.regs[8];
 #endif
-       return do_fork(clone_flags, newsp, &regs, 0,
+       return do_fork(clone_flags, newsp, 0,
                       parent_tidptr, child_tidptr);
 }
 

diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index ecde946..be8e862 100644 (file)
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -286,8 +286,7 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
        parent_tid_ptr = regs->u_regs[UREG_I2];
        child_tid_ptr = regs->u_regs[UREG_I4];
 
-       ret = do_fork(clone_flags, stack_start,
-                     regs, stack_size,
+       ret = do_fork(clone_flags, stack_start, stack_size,
                      (int __user *) parent_tid_ptr,
                      (int __user *) child_tid_ptr);
 

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 58ef19e..cdb80b2 100644 (file)
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -601,8 +601,7 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags,
                child_tid_ptr = (int __user *) regs->u_regs[UREG_I4];
        }
 
-       ret = do_fork(clone_flags, stack_start,
-                     regs, stack_size,
+       ret = do_fork(clone_flags, stack_start, stack_size,
                      parent_tid_ptr, child_tid_ptr);
 
        /* If we get an error and potentially restart the system

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 78a2ae3..1162258 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2289,7 +2289,7 @@ extern int disallow_signal(int);
 extern int do_execve(const char *,
                     const char __user * const __user *,
                     const char __user * const __user *);
-extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
+extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *);
 struct task_struct *fork_idle(int);
 #ifdef CONFIG_GENERIC_KERNEL_THREAD
 extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);

diff --git a/kernel/fork.c b/kernel/fork.c
index 0e68b66..5407307 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1527,8 +1527,6 @@ static inline void init_idle_pids(struct pid_link *links)
 struct task_struct * __cpuinit fork_idle(int cpu)
 {
        struct task_struct *task;
-       struct pt_regs regs;
-
        task = copy_process(CLONE_VM, 0, 0, NULL, &init_struct_pid, 0);
        if (!IS_ERR(task)) {
                init_idle_pids(task->pids);
@@ -1546,7 +1544,6 @@ struct task_struct * __cpuinit fork_idle(int cpu)
  */
 long do_fork(unsigned long clone_flags,
              unsigned long stack_start,
-             struct pt_regs *regs,
              unsigned long stack_size,
              int __user *parent_tidptr,
              int __user *child_tidptr)
@@ -1576,7 +1573,7 @@ long do_fork(unsigned long clone_flags,
         * requested, no event is reported; otherwise, report if the event
         * for the type of forking is enabled.
         */
-       if (!(clone_flags & CLONE_UNTRACED) && likely(user_mode(regs))) {
+       if (!(clone_flags & CLONE_UNTRACED)) {
                if (clone_flags & CLONE_VFORK)
                        trace = PTRACE_EVENT_VFORK;
                else if ((clone_flags & CSIGNAL) != SIGCHLD)
@@ -1632,7 +1629,7 @@ long do_fork(unsigned long clone_flags,
  */
 pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
 {
-       return do_fork(flags|CLONE_VM|CLONE_UNTRACED, (unsigned long)fn, NULL,
+       return do_fork(flags|CLONE_VM|CLONE_UNTRACED, (unsigned long)fn,
                (unsigned long)arg, NULL, NULL);
 }
 #endif
@@ -1641,7 +1638,7 @@ pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
 SYSCALL_DEFINE0(fork)
 {
 #ifdef CONFIG_MMU
-       return do_fork(SIGCHLD, 0, current_pt_regs(), 0, NULL, NULL);
+       return do_fork(SIGCHLD, 0, 0, NULL, NULL);
 #else
        /* can not support in nommu mode */
        return(-EINVAL);
@@ -1652,7 +1649,7 @@ SYSCALL_DEFINE0(fork)
 #ifdef __ARCH_WANT_SYS_VFORK
 SYSCALL_DEFINE0(vfork)
 {
-       return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, current_pt_regs(),
+       return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, 
                        0, NULL, NULL);
 }
 #endif
@@ -1675,7 +1672,7 @@ SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp,
                 int, tls_val)
 #endif
 {
-       return do_fork(clone_flags, newsp, current_pt_regs(), 0,
+       return do_fork(clone_flags, newsp, 0,
                parent_tidptr, child_tidptr);
 }
 #endif