summaryrefslogtreecommitdiffstats
path: root/arch/mips64/kernel/process.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
commit012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch)
tree87efc733f9b164e8c85c0336f92c8fb7eff6d183 /arch/mips64/kernel/process.c
parent625a1589d3d6464b5d90b8a0918789e3afffd220 (diff)
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem.
Diffstat (limited to 'arch/mips64/kernel/process.c')
-rw-r--r--arch/mips64/kernel/process.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips64/kernel/process.c b/arch/mips64/kernel/process.c
index 924140719..df03ef081 100644
--- a/arch/mips64/kernel/process.c
+++ b/arch/mips64/kernel/process.c
@@ -69,6 +69,7 @@ void flush_thread(void)
}
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+ unsigned long unused,
struct task_struct * p, struct pt_regs * regs)
{
struct pt_regs * childregs;