Commit 6c96c8f7 authored by David Mosberger's avatar David Mosberger

ia64: Minor fixes: remove obsolete ia64_ret_from_execve_syscall() and

	fix bit rot in signal debug printk.
parent de387244
...@@ -713,17 +713,6 @@ GLOBAL_ENTRY(ia64_leave_syscall) ...@@ -713,17 +713,6 @@ GLOBAL_ENTRY(ia64_leave_syscall)
br.cond.sptk.many rbs_switch br.cond.sptk.many rbs_switch
END(ia64_leave_syscall) END(ia64_leave_syscall)
GLOBAL_ENTRY(ia64_ret_from_execve_syscall)
PT_REGS_UNWIND_INFO(0)
cmp.ge p6,p7=r8,r0 // syscall executed successfully?
adds r2=PT(R8)+16,sp // r2 = &pt_regs.r8
adds r3=PT(R10)+16,sp // r3 = &pt_regs.r10
;;
.mem.offset 0,0; (p6) st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit
.mem.offset 8,0; (p6) st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit
(p7) br.cond.spnt handle_syscall_error // handle potential syscall failure
END(ia64_ret_from_execve_syscall)
// fall through
GLOBAL_ENTRY(ia64_leave_kernel) GLOBAL_ENTRY(ia64_leave_kernel)
PT_REGS_UNWIND_INFO(0) PT_REGS_UNWIND_INFO(0)
/* /*
......
...@@ -470,8 +470,8 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, ...@@ -470,8 +470,8 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
scr->scratch_unat = 0; /* ensure NaT bits of r12 is clear */ scr->scratch_unat = 0; /* ensure NaT bits of r12 is clear */
#if DEBUG_SIG #if DEBUG_SIG
printk("SIG deliver (%s:%d): sig=%d sp=%lx ip=%lx handler=%lx\n", printk("SIG deliver (%s:%d): sig=%d sp=%lx ip=%lx handler=%p\n",
current->comm, current->pid, sig, scr->pt.r12, scr->pt.cr_iip, scr->pt.r3); current->comm, current->pid, sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
#endif #endif
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment