Merge commit 'origin/master' into for-linus/xen/master
[linux-2.6.git] / arch / x86 / kernel / process_64.c
index e8a9aaf..66ad067 100644 (file)
@@ -278,7 +278,7 @@ void prepare_to_copy(struct task_struct *tsk)
        unlazy_fpu(tsk);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
                unsigned long unused,
        struct task_struct *p, struct pt_regs *regs)
 {