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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
syscalls.S
diff --git
a/arch/sparc/kernel/syscalls.S
b/arch/sparc/kernel/syscalls.S
index
7a6786a
..
87f5a3b
100644
(file)
--- a/
arch/sparc/kernel/syscalls.S
+++ b/
arch/sparc/kernel/syscalls.S
@@
-20,7
+20,7
@@
execve_merge:
add %sp, PTREGS_OFF, %o0
.align 32
-sys_pipe:
+sys_
sparc_
pipe:
ba,pt %xcc, sparc_pipe
add %sp, PTREGS_OFF, %o0
sys_nis_syscall: