diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
| commit | 484cad34dd667235565c14a40e2f5a8143184aaa (patch) | |
| tree | 70bb901671958960a64d7f383c902178b4b49558 /arch/m32r/kernel/process.c | |
| parent | 95a38f34635bdf06089de763b4becbc957694977 (diff) | |
| parent | 67796bf7dc54c035fd97f2681a72e5d2bf2a234a (diff) | |
Merge branch 'dma-debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/m32r/kernel/process.c')
| -rw-r--r-- | arch/m32r/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 7103d91e1a2f..3e876f0baebc 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
| @@ -225,7 +225,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) | |||
| 225 | return 0; /* Task didn't use the fpu at all. */ | 225 | return 0; /* Task didn't use the fpu at all. */ |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | int copy_thread(int nr, unsigned long clone_flags, unsigned long spu, | 228 | int copy_thread(unsigned long clone_flags, unsigned long spu, |
| 229 | unsigned long unused, struct task_struct *tsk, struct pt_regs *regs) | 229 | unsigned long unused, struct task_struct *tsk, struct pt_regs *regs) |
| 230 | { | 230 | { |
| 231 | struct pt_regs *childregs = task_pt_regs(tsk); | 231 | struct pt_regs *childregs = task_pt_regs(tsk); |
