diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/sparc/kernel/syscalls.S | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/sparc/kernel/syscalls.S')
| -rw-r--r-- | arch/sparc/kernel/syscalls.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S index 87f5a3b8a253..d150c2aa98d2 100644 --- a/arch/sparc/kernel/syscalls.S +++ b/arch/sparc/kernel/syscalls.S | |||
| @@ -21,7 +21,7 @@ execve_merge: | |||
| 21 | 21 | ||
| 22 | .align 32 | 22 | .align 32 |
| 23 | sys_sparc_pipe: | 23 | sys_sparc_pipe: |
| 24 | ba,pt %xcc, sparc_pipe | 24 | ba,pt %xcc, sys_sparc_pipe_real |
| 25 | add %sp, PTREGS_OFF, %o0 | 25 | add %sp, PTREGS_OFF, %o0 |
| 26 | sys_nis_syscall: | 26 | sys_nis_syscall: |
| 27 | ba,pt %xcc, c_sys_nis_syscall | 27 | ba,pt %xcc, c_sys_nis_syscall |