diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
commit | 97309d1a0bbdcb0813ea08574b4473d8e5416012 (patch) | |
tree | 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b /arch/sparc/kernel/entry.S | |
parent | b4ea75b649417606fd6b38710a2962ec9770e772 (diff) | |
parent | efd51b5c6798d103e3aa683464aebb2019b62119 (diff) | |
download | kernel_samsung_smdk4412-97309d1a0bbdcb0813ea08574b4473d8e5416012.zip kernel_samsung_smdk4412-97309d1a0bbdcb0813ea08574b4473d8e5416012.tar.gz kernel_samsung_smdk4412-97309d1a0bbdcb0813ea08574b4473d8e5416012.tar.bz2 |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/sparc/kernel/entry.S')
-rw-r--r-- | arch/sparc/kernel/entry.S | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 03ecb4e..c51d08d 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -1277,62 +1277,6 @@ sys_sigstack: mov %l5, %o7 .align 4 - .globl sys_sigpause -sys_sigpause: - /* Note: %o0 already has correct value... */ - call do_sigpause - add %sp, STACKFRAME_SZ, %o1 - - ld [%curptr + TI_FLAGS], %l5 - andcc %l5, _TIF_SYSCALL_TRACE, %g0 - be 1f - nop - - call syscall_trace - nop - -1: - /* We are returning to a signal handler. */ - RESTORE_ALL - - .align 4 - .globl sys_sigsuspend -sys_sigsuspend: - call do_sigsuspend - add %sp, STACKFRAME_SZ, %o0 - - ld [%curptr + TI_FLAGS], %l5 - andcc %l5, _TIF_SYSCALL_TRACE, %g0 - be 1f - nop - - call syscall_trace - nop - -1: - /* We are returning to a signal handler. */ - RESTORE_ALL - - .align 4 - .globl sys_rt_sigsuspend -sys_rt_sigsuspend: - /* Note: %o0, %o1 already have correct value... */ - call do_rt_sigsuspend - add %sp, STACKFRAME_SZ, %o2 - - ld [%curptr + TI_FLAGS], %l5 - andcc %l5, _TIF_SYSCALL_TRACE, %g0 - be 1f - nop - - call syscall_trace - nop - -1: - /* We are returning to a signal handler. */ - RESTORE_ALL - - .align 4 .globl sys_sigreturn sys_sigreturn: call do_sigreturn |