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/blackfin | |
| 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/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c index 33e2e8993f7f..f49427293ca1 100644 --- a/arch/blackfin/kernel/process.c +++ b/arch/blackfin/kernel/process.c | |||
| @@ -193,7 +193,7 @@ asmlinkage int bfin_clone(struct pt_regs *regs) | |||
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | int | 195 | int |
| 196 | copy_thread(int nr, unsigned long clone_flags, | 196 | copy_thread(unsigned long clone_flags, |
| 197 | unsigned long usp, unsigned long topstk, | 197 | unsigned long usp, unsigned long topstk, |
| 198 | struct task_struct *p, struct pt_regs *regs) | 198 | struct task_struct *p, struct pt_regs *regs) |
| 199 | { | 199 | { |