diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 02:29:05 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 02:29:05 -0700 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /arch/cris/arch-v32 | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
| download | talos-op-linux-65127d28e312bb6b38ce84a7bb71d762ef63ad4c.tar.gz talos-op-linux-65127d28e312bb6b38ce84a7bb71d762ef63ad4c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'arch/cris/arch-v32')
| -rw-r--r-- | arch/cris/arch-v32/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c index ced5b725d9bd..120e7f796fea 100644 --- a/arch/cris/arch-v32/kernel/process.c +++ b/arch/cris/arch-v32/kernel/process.c @@ -131,7 +131,7 @@ kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) extern asmlinkage void ret_from_fork(void); int -copy_thread(int nr, unsigned long clone_flags, unsigned long usp, +copy_thread(unsigned long clone_flags, unsigned long usp, unsigned long unused, struct task_struct *p, struct pt_regs *regs) { |
