Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / arch / cris / arch-v32 / kernel / process.c

diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 331e70252df0f6aff714a1b9e6ae969773c25d7d..2b23ef0e44523f1781ad397533593aae2f9335c7 100644 (file)
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -109,8 +109,7 @@ extern asmlinkage void ret_from_kernel_thread(void);
 
 int
 copy_thread(unsigned long clone_flags, unsigned long usp,
-       unsigned long arg,
-       struct task_struct *p, struct pt_regs *unused)
+       unsigned long arg, struct task_struct *p)
 {
        struct pt_regs *childregs = task_pt_regs(p);
        struct switch_stack *swstack = ((struct switch_stack *) childregs) - 1;