diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /arch/ia64/kernel/entry.S | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 47b972cb4..eb575a39c 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -738,7 +738,7 @@ handle_syscall_error: st8.spill [r2]=r9 // store errno in pt_regs.r8 and set unat bit st8.spill [r3]=r10 // store error indication in pt_regs.r10 and set unat bit br.cond.sptk.many ia64_leave_kernel - .endp __ret_from_syscall + .endp handle_syscall_error #ifdef CONFIG_SMP /* @@ -767,7 +767,9 @@ invoke_schedule_tail: invoke_do_softirq: alloc loc0=ar.pfs,8,2,0,0 mov loc1=rp +(pEOI) mov cr.eoi=r0 ;; +(pEOI) cmp.ne pEOI,p0=r0,r0 br.call.sptk.few rp=do_softirq .ret9: mov ar.pfs=loc0 |