]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Pull delete-sigdelayed into release branch
authorTony Luck <tony.luck@intel.com>
Tue, 21 Mar 2006 16:17:38 +0000 (08:17 -0800)
committerTony Luck <tony.luck@intel.com>
Tue, 21 Mar 2006 16:17:38 +0000 (08:17 -0800)
1  2 
arch/ia64/kernel/entry.S

diff --combined arch/ia64/kernel/entry.S
index 930fdfca6ddb610092a92f692419469fe4cab39d,9dda7a36d1eeaaa46c170b0885db6e453e62f745..0e3eda99e5494eb21187894dae2556717d37f6f0
@@@ -569,9 -569,7 +569,9 @@@ GLOBAL_ENTRY(ia64_trace_syscall
  .mem.offset 0,0; st8.spill [r2]=r8            // store return value in slot for r8
  .mem.offset 8,0; st8.spill [r3]=r10           // clear error indication in slot for r10
        br.call.sptk.many rp=syscall_trace_leave // give parent a chance to catch return value
 -.ret3:        br.cond.sptk .work_pending_syscall_end
 +.ret3:
 +(pUStk)       cmp.eq.unc p6,p0=r0,r0                  // p6 <- pUStk
 +      br.cond.sptk .work_pending_syscall_end
  
  strace_error:
        ld8 r3=[r2]                             // load pt_regs.r8
@@@ -1102,9 -1100,6 +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
  (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
@@@ -1603,21 -1587,5 +1589,21 @@@ sys_call_table
        data8 sys_inotify_add_watch
        data8 sys_inotify_rm_watch
        data8 sys_migrate_pages                 // 1280
 +      data8 sys_openat
 +      data8 sys_mkdirat
 +      data8 sys_mknodat
 +      data8 sys_fchownat
 +      data8 sys_futimesat                     // 1285
 +      data8 sys_newfstatat
 +      data8 sys_unlinkat
 +      data8 sys_renameat
 +      data8 sys_linkat
 +      data8 sys_symlinkat                     // 1290
 +      data8 sys_readlinkat
 +      data8 sys_fchmodat
 +      data8 sys_faccessat
 +      data8 sys_ni_syscall                    // reserved for pselect
 +      data8 sys_ni_syscall                    // 1295 reserved for ppoll
 +      data8 sys_unshare
  
        .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls