diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-23 21:51:00 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-23 21:51:00 +0100 |
| commit | 4c8af5254e741983e141e10002e01abba87f8419 (patch) | |
| tree | a932954630715a0e9b4f20fdfe74255b441096c5 /arch/sparc64/solaris/entry64.S | |
| parent | [CIFS] Do not zero non-existent iovec in SendReceive response processing. (diff) | |
| parent | [SPARC64]: Use compat_sys_futimesat in 32-bit syscall table. (diff) | |
| download | linux-4c8af5254e741983e141e10002e01abba87f8419.tar.xz linux-4c8af5254e741983e141e10002e01abba87f8419.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/sparc64/solaris/entry64.S')
| -rw-r--r-- | arch/sparc64/solaris/entry64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/solaris/entry64.S b/arch/sparc64/solaris/entry64.S index 4b6ae583c0a3..eb314ed23cdb 100644 --- a/arch/sparc64/solaris/entry64.S +++ b/arch/sparc64/solaris/entry64.S @@ -180,6 +180,8 @@ solaris_sigsuspend: nop call sys_sigsuspend stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] + b,pt %xcc, ret_from_solaris + nop .globl solaris_getpid solaris_getpid: |