git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
process_64.c
diff --git
a/arch/sparc/kernel/process_64.c
b/arch/sparc/kernel/process_64.c
index
a73954b
..
4041f94
100644
(file)
--- a/
arch/sparc/kernel/process_64.c
+++ b/
arch/sparc/kernel/process_64.c
@@
-561,7
+561,7
@@
asmlinkage long sparc_do_fork(unsigned long clone_flags,
* Parent --> %o0 == childs pid, %o1 == 0
* Child --> %o0 == parents pid, %o1 == 1
*/
* Parent --> %o0 == childs pid, %o1 == 0
* Child --> %o0 == parents pid, %o1 == 1
*/
-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)
{
unsigned long unused,
struct task_struct *p, struct pt_regs *regs)
{