diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /arch/frv/kernel/process.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'arch/frv/kernel/process.c')
| -rw-r--r-- | arch/frv/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 9583a338e9d6..0de50df74970 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c | |||
| @@ -204,7 +204,7 @@ void prepare_to_copy(struct task_struct *tsk) | |||
| 204 | /* | 204 | /* |
| 205 | * set up the kernel stack and exception frames for a new process | 205 | * set up the kernel stack and exception frames for a new process |
| 206 | */ | 206 | */ |
| 207 | int copy_thread(int nr, unsigned long clone_flags, | 207 | int copy_thread(unsigned long clone_flags, |
| 208 | unsigned long usp, unsigned long topstk, | 208 | unsigned long usp, unsigned long topstk, |
| 209 | struct task_struct *p, struct pt_regs *regs) | 209 | struct task_struct *p, struct pt_regs *regs) |
| 210 | { | 210 | { |