diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-03-21 19:17:38 +0300 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-21 19:17:38 +0300 |
| commit | 581249966ffeb0463bad1b0e087e1bb29ed53707 (patch) | |
| tree | d0cc7c15ff2cd9c65799a114b0f8e2257765f1e6 /arch/ia64/kernel/entry.S | |
| parent | 6a8a8e14bed179f2d415c7f4fee51233c35c10c3 (diff) | |
| parent | b0a06623dc4caf6dfb6a84419507643471676d20 (diff) | |
| download | linux-581249966ffeb0463bad1b0e087e1bb29ed53707.tar.xz | |
Pull delete-sigdelayed into release branch
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 930fdfca6ddb..0e3eda99e549 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1102,9 +1102,6 @@ skip_rbs_switch: st8 [r2]=r8 st8 [r3]=r10 .work_pending: - tbit.nz p6,p0=r31,TIF_SIGDELAYED // signal delayed from MCA/INIT/NMI/PMI context? -(p6) br.cond.sptk.few .sigdelayed - ;; tbit.z p6,p0=r31,TIF_NEED_RESCHED // current_thread_info()->need_resched==0? (p6) br.cond.sptk.few .notify #ifdef CONFIG_PREEMPT @@ -1131,17 +1128,6 @@ skip_rbs_switch: (pLvSys)br.cond.sptk.few .work_pending_syscall_end br.cond.sptk.many .work_processed_kernel // don't re-check -// There is a delayed signal that was detected in MCA/INIT/NMI/PMI context where -// it could not be delivered. Deliver it now. The signal might be for us and -// may set TIF_SIGPENDING, so redrive ia64_leave_* after processing the delayed -// signal. - -.sigdelayed: - br.call.sptk.many rp=do_sigdelayed - cmp.eq p6,p0=r0,r0 // p6 <- 1, always re-check -(pLvSys)br.cond.sptk.few .work_pending_syscall_end - br.cond.sptk.many .work_processed_kernel // re-check - .work_pending_syscall_end: adds r2=PT(R8)+16,r12 adds r3=PT(R10)+16,r12 |