提交 6f2c55b8 编写于 作者: A Alexey Dobriyan 提交者: Linus Torvalds

Simplify copy_thread()

First argument unused since 2.3.11.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 14dd1ff0
...@@ -272,7 +272,7 @@ alpha_vfork(struct pt_regs *regs) ...@@ -272,7 +272,7 @@ alpha_vfork(struct pt_regs *regs)
*/ */
int int
copy_thread(int nr, unsigned long clone_flags, unsigned long usp, copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct * p, struct pt_regs * regs) struct task_struct * p, struct pt_regs * regs)
{ {
......
...@@ -301,7 +301,7 @@ void release_thread(struct task_struct *dead_task) ...@@ -301,7 +301,7 @@ void release_thread(struct task_struct *dead_task)
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
int int
copy_thread(int nr, unsigned long clone_flags, unsigned long stack_start, copy_thread(unsigned long clone_flags, unsigned long stack_start,
unsigned long stk_sz, struct task_struct *p, struct pt_regs *regs) unsigned long stk_sz, struct task_struct *p, struct pt_regs *regs)
{ {
struct thread_info *thread = task_thread_info(p); struct thread_info *thread = task_thread_info(p);
......
...@@ -332,7 +332,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) ...@@ -332,7 +332,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
asmlinkage void ret_from_fork(void); asmlinkage void ret_from_fork(void);
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -193,7 +193,7 @@ asmlinkage int bfin_clone(struct pt_regs *regs) ...@@ -193,7 +193,7 @@ asmlinkage int bfin_clone(struct pt_regs *regs)
} }
int int
copy_thread(int nr, unsigned long clone_flags, copy_thread(unsigned long clone_flags,
unsigned long usp, unsigned long topstk, unsigned long usp, unsigned long topstk,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -115,7 +115,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) ...@@ -115,7 +115,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
*/ */
asmlinkage void ret_from_fork(void); asmlinkage void ret_from_fork(void);
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -131,7 +131,7 @@ kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) ...@@ -131,7 +131,7 @@ kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
extern asmlinkage void ret_from_fork(void); extern asmlinkage void ret_from_fork(void);
int int
copy_thread(int nr, unsigned long clone_flags, unsigned long usp, copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -204,7 +204,7 @@ void prepare_to_copy(struct task_struct *tsk) ...@@ -204,7 +204,7 @@ void prepare_to_copy(struct task_struct *tsk)
/* /*
* set up the kernel stack and exception frames for a new process * set up the kernel stack and exception frames for a new process
*/ */
int copy_thread(int nr, unsigned long clone_flags, int copy_thread(unsigned long clone_flags,
unsigned long usp, unsigned long topstk, unsigned long usp, unsigned long topstk,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -191,7 +191,7 @@ asmlinkage int h8300_clone(struct pt_regs *regs) ...@@ -191,7 +191,7 @@ asmlinkage int h8300_clone(struct pt_regs *regs)
} }
int copy_thread(int nr, unsigned long clone_flags, int copy_thread(unsigned long clone_flags,
unsigned long usp, unsigned long topstk, unsigned long usp, unsigned long topstk,
struct task_struct * p, struct pt_regs * regs) struct task_struct * p, struct pt_regs * regs)
{ {
......
...@@ -413,7 +413,7 @@ ia64_load_extra (struct task_struct *task) ...@@ -413,7 +413,7 @@ ia64_load_extra (struct task_struct *task)
* so there is nothing to worry about. * so there is nothing to worry about.
*/ */
int int
copy_thread (int nr, unsigned long clone_flags, copy_thread(unsigned long clone_flags,
unsigned long user_stack_base, unsigned long user_stack_size, unsigned long user_stack_base, unsigned long user_stack_size,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -225,7 +225,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) ...@@ -225,7 +225,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
return 0; /* Task didn't use the fpu at all. */ return 0; /* Task didn't use the fpu at all. */
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long spu, int copy_thread(unsigned long clone_flags, unsigned long spu,
unsigned long unused, struct task_struct *tsk, struct pt_regs *regs) unsigned long unused, struct task_struct *tsk, struct pt_regs *regs)
{ {
struct pt_regs *childregs = task_pt_regs(tsk); struct pt_regs *childregs = task_pt_regs(tsk);
......
...@@ -233,7 +233,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs) ...@@ -233,7 +233,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
parent_tidptr, child_tidptr); parent_tidptr, child_tidptr);
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct * p, struct pt_regs * regs) struct task_struct * p, struct pt_regs * regs)
{ {
......
...@@ -199,7 +199,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs) ...@@ -199,7 +199,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
return do_fork(clone_flags, newsp, regs, 0, NULL, NULL); return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
} }
int copy_thread(int nr, unsigned long clone_flags, int copy_thread(unsigned long clone_flags,
unsigned long usp, unsigned long topstk, unsigned long usp, unsigned long topstk,
struct task_struct * p, struct pt_regs * regs) struct task_struct * p, struct pt_regs * regs)
{ {
......
...@@ -99,7 +99,7 @@ void flush_thread(void) ...@@ -99,7 +99,7 @@ void flush_thread(void)
{ {
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, struct task_struct *p, struct pt_regs *regs) unsigned long unused, struct task_struct *p, struct pt_regs *regs)
{ {
struct thread_info *ti = task_thread_info(p); struct thread_info *ti = task_thread_info(p);
......
...@@ -193,7 +193,7 @@ void prepare_to_copy(struct task_struct *tsk) ...@@ -193,7 +193,7 @@ void prepare_to_copy(struct task_struct *tsk)
* set up the kernel stack for a new thread and copy arch-specific thread * set up the kernel stack for a new thread and copy arch-specific thread
* control information * control information
*/ */
int copy_thread(int nr, unsigned long clone_flags, int copy_thread(unsigned long clone_flags,
unsigned long c_usp, unsigned long ustk_size, unsigned long c_usp, unsigned long ustk_size,
struct task_struct *p, struct pt_regs *kregs) struct task_struct *p, struct pt_regs *kregs)
{ {
......
...@@ -263,7 +263,7 @@ sys_vfork(struct pt_regs *regs) ...@@ -263,7 +263,7 @@ sys_vfork(struct pt_regs *regs)
} }
int int
copy_thread(int nr, unsigned long clone_flags, unsigned long usp, copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, /* in ia64 this is "user_stack_size" */ unsigned long unused, /* in ia64 this is "user_stack_size" */
struct task_struct * p, struct pt_regs * pregs) struct task_struct * p, struct pt_regs * pregs)
{ {
......
...@@ -598,7 +598,7 @@ void prepare_to_copy(struct task_struct *tsk) ...@@ -598,7 +598,7 @@ void prepare_to_copy(struct task_struct *tsk)
/* /*
* Copy a thread.. * Copy a thread..
*/ */
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, struct task_struct *p, unsigned long unused, struct task_struct *p,
struct pt_regs *regs) struct pt_regs *regs)
{ {
......
...@@ -160,7 +160,7 @@ void release_thread(struct task_struct *dead_task) ...@@ -160,7 +160,7 @@ void release_thread(struct task_struct *dead_task)
{ {
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long new_stackp, int copy_thread(unsigned long clone_flags, unsigned long new_stackp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -170,7 +170,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) ...@@ -170,7 +170,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
asmlinkage void ret_from_fork(void); asmlinkage void ret_from_fork(void);
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -425,7 +425,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) ...@@ -425,7 +425,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
asmlinkage void ret_from_fork(void); asmlinkage void ret_from_fork(void);
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -455,7 +455,7 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, ...@@ -455,7 +455,7 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
*/ */
extern void ret_from_fork(void); extern void ret_from_fork(void);
int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, int copy_thread(unsigned long clone_flags, unsigned long sp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -561,7 +561,7 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags, ...@@ -561,7 +561,7 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags,
* Parent --> %o0 == childs pid, %o1 == 0 * Parent --> %o0 == childs pid, %o1 == 0
* Child --> %o0 == parents pid, %o1 == 1 * Child --> %o0 == parents pid, %o1 == 1
*/ */
int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, int copy_thread(unsigned long clone_flags, unsigned long sp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -179,7 +179,7 @@ void fork_handler(void) ...@@ -179,7 +179,7 @@ void fork_handler(void)
userspace(&current->thread.regs.regs); userspace(&current->thread.regs.regs);
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, int copy_thread(unsigned long clone_flags, unsigned long sp,
unsigned long stack_top, struct task_struct * p, unsigned long stack_top, struct task_struct * p,
struct pt_regs *regs) struct pt_regs *regs)
{ {
......
...@@ -245,7 +245,7 @@ void prepare_to_copy(struct task_struct *tsk) ...@@ -245,7 +245,7 @@ void prepare_to_copy(struct task_struct *tsk)
unlazy_fpu(tsk); unlazy_fpu(tsk);
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, int copy_thread(unsigned long clone_flags, unsigned long sp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -278,7 +278,7 @@ void prepare_to_copy(struct task_struct *tsk) ...@@ -278,7 +278,7 @@ void prepare_to_copy(struct task_struct *tsk)
unlazy_fpu(tsk); unlazy_fpu(tsk);
} }
int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, int copy_thread(unsigned long clone_flags, unsigned long sp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {
......
...@@ -172,7 +172,7 @@ void prepare_to_copy(struct task_struct *tsk) ...@@ -172,7 +172,7 @@ void prepare_to_copy(struct task_struct *tsk)
* childregs. * childregs.
*/ */
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, int copy_thread(unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct * p, struct pt_regs * regs) struct task_struct * p, struct pt_regs * regs)
{ {
......
...@@ -1975,7 +1975,8 @@ extern void mm_release(struct task_struct *, struct mm_struct *); ...@@ -1975,7 +1975,8 @@ extern void mm_release(struct task_struct *, struct mm_struct *);
/* Allocate a new mm structure and copy contents from tsk->mm */ /* Allocate a new mm structure and copy contents from tsk->mm */
extern struct mm_struct *dup_mm(struct task_struct *tsk); extern struct mm_struct *dup_mm(struct task_struct *tsk);
extern int copy_thread(int, unsigned long, unsigned long, unsigned long, struct task_struct *, struct pt_regs *); extern int copy_thread(unsigned long, unsigned long, unsigned long,
struct task_struct *, struct pt_regs *);
extern void flush_thread(void); extern void flush_thread(void);
extern void exit_thread(void); extern void exit_thread(void);
......
...@@ -1125,7 +1125,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, ...@@ -1125,7 +1125,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
goto bad_fork_cleanup_mm; goto bad_fork_cleanup_mm;
if ((retval = copy_io(clone_flags, p))) if ((retval = copy_io(clone_flags, p)))
goto bad_fork_cleanup_namespaces; goto bad_fork_cleanup_namespaces;
retval = copy_thread(0, clone_flags, stack_start, stack_size, p, regs); retval = copy_thread(clone_flags, stack_start, stack_size, p, regs);
if (retval) if (retval)
goto bad_fork_cleanup_io; goto bad_fork_cleanup_io;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册