diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/entry.S | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 7a53530f22c2..ddea607f948a 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -1169,21 +1169,8 @@ skip_rbs_switch: | |||
1169 | .work_pending: | 1169 | .work_pending: |
1170 | tbit.z p6,p0=r31,TIF_NEED_RESCHED // is resched not needed? | 1170 | tbit.z p6,p0=r31,TIF_NEED_RESCHED // is resched not needed? |
1171 | (p6) br.cond.sptk.few .notify | 1171 | (p6) br.cond.sptk.few .notify |
1172 | #ifdef CONFIG_PREEMPT | 1172 | br.call.spnt.many rp=preempt_schedule_irq |
1173 | (pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1 | ||
1174 | ;; | ||
1175 | (pKStk) st4 [r20]=r21 | ||
1176 | #endif | ||
1177 | SSM_PSR_I(p0, p6, r2) // enable interrupts | ||
1178 | br.call.spnt.many rp=schedule | ||
1179 | .ret9: cmp.eq p6,p0=r0,r0 // p6 <- 1 (re-check) | 1173 | .ret9: cmp.eq p6,p0=r0,r0 // p6 <- 1 (re-check) |
1180 | RSM_PSR_I(p0, r2, r20) // disable interrupts | ||
1181 | ;; | ||
1182 | #ifdef CONFIG_PREEMPT | ||
1183 | (pKStk) adds r20=TI_PRE_COUNT+IA64_TASK_SIZE,r13 | ||
1184 | ;; | ||
1185 | (pKStk) st4 [r20]=r0 // preempt_count() <- 0 | ||
1186 | #endif | ||
1187 | (pLvSys)br.cond.sptk.few __paravirt_pending_syscall_end | 1174 | (pLvSys)br.cond.sptk.few __paravirt_pending_syscall_end |
1188 | br.cond.sptk.many .work_processed_kernel | 1175 | br.cond.sptk.many .work_processed_kernel |
1189 | 1176 | ||