diff options
-rw-r--r-- | arch/ia64/kernel/entry.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index ef6b0313c857..ca2bb95726de 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -1167,7 +1167,7 @@ skip_rbs_switch: | |||
1167 | st8 [r2]=r8 | 1167 | st8 [r2]=r8 |
1168 | st8 [r3]=r10 | 1168 | st8 [r3]=r10 |
1169 | .work_pending: | 1169 | .work_pending: |
1170 | tbit.z p6,p0=r31,TIF_NEED_RESCHED // current_thread_info()->need_resched==0? | 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 | #ifdef CONFIG_PREEMPT |
1173 | (pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1 | 1173 | (pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1 |
@@ -1176,7 +1176,7 @@ skip_rbs_switch: | |||
1176 | #endif | 1176 | #endif |
1177 | ssm psr.i // enable interrupts | 1177 | ssm psr.i // enable interrupts |
1178 | br.call.spnt.many rp=schedule | 1178 | br.call.spnt.many rp=schedule |
1179 | .ret9: cmp.eq p6,p0=r0,r0 // p6 <- 1 | 1179 | .ret9: cmp.eq p6,p0=r0,r0 // p6 <- 1 (re-check) |
1180 | rsm psr.i // disable interrupts | 1180 | rsm psr.i // disable interrupts |
1181 | ;; | 1181 | ;; |
1182 | #ifdef CONFIG_PREEMPT | 1182 | #ifdef CONFIG_PREEMPT |
@@ -1185,13 +1185,13 @@ skip_rbs_switch: | |||
1185 | (pKStk) st4 [r20]=r0 // preempt_count() <- 0 | 1185 | (pKStk) st4 [r20]=r0 // preempt_count() <- 0 |
1186 | #endif | 1186 | #endif |
1187 | (pLvSys)br.cond.sptk.few .work_pending_syscall_end | 1187 | (pLvSys)br.cond.sptk.few .work_pending_syscall_end |
1188 | br.cond.sptk.many .work_processed_kernel // re-check | 1188 | br.cond.sptk.many .work_processed_kernel |
1189 | 1189 | ||
1190 | .notify: | 1190 | .notify: |
1191 | (pUStk) br.call.spnt.many rp=notify_resume_user | 1191 | (pUStk) br.call.spnt.many rp=notify_resume_user |
1192 | .ret10: cmp.ne p6,p0=r0,r0 // p6 <- 0 | 1192 | .ret10: cmp.ne p6,p0=r0,r0 // p6 <- 0 (don't re-check) |
1193 | (pLvSys)br.cond.sptk.few .work_pending_syscall_end | 1193 | (pLvSys)br.cond.sptk.few .work_pending_syscall_end |
1194 | br.cond.sptk.many .work_processed_kernel // don't re-check | 1194 | br.cond.sptk.many .work_processed_kernel |
1195 | 1195 | ||
1196 | .work_pending_syscall_end: | 1196 | .work_pending_syscall_end: |
1197 | adds r2=PT(R8)+16,r12 | 1197 | adds r2=PT(R8)+16,r12 |
@@ -1199,7 +1199,7 @@ skip_rbs_switch: | |||
1199 | ;; | 1199 | ;; |
1200 | ld8 r8=[r2] | 1200 | ld8 r8=[r2] |
1201 | ld8 r10=[r3] | 1201 | ld8 r10=[r3] |
1202 | br.cond.sptk.many .work_processed_syscall // re-check | 1202 | br.cond.sptk.many .work_processed_syscall |
1203 | 1203 | ||
1204 | END(ia64_leave_kernel) | 1204 | END(ia64_leave_kernel) |
1205 | 1205 | ||