Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[IA64] trivial cleanup for entry.S
This patch does:
- make comment at next to resched check more robust
- move "re-check" comments to next to where change predicate regs
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
authored by Hidetoshi Seto and committed by Tony Luck 2e513fe4 3633c730
+6
-6
arch/ia64/kernel/entry.S
+6
-6
arch/ia64/kernel/entry.S
···
1167
st8 [r2]=r8
1168
st8 [r3]=r10
1169
.work_pending:
1170
-
tbit.z p6,p0=r31,TIF_NEED_RESCHED // current_thread_info()->need_resched==0?
1171
(p6) br.cond.sptk.few .notify
1172
#ifdef CONFIG_PREEMPT
1173
(pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1
···
1176
#endif
1177
ssm psr.i // enable interrupts
1178
br.call.spnt.many rp=schedule
1179
-
.ret9: cmp.eq p6,p0=r0,r0 // p6 <- 1
1180
rsm psr.i // disable interrupts
1181
;;
1182
#ifdef CONFIG_PREEMPT
···
1185
(pKStk) st4 [r20]=r0 // preempt_count() <- 0
1186
#endif
1187
(pLvSys)br.cond.sptk.few .work_pending_syscall_end
1188
-
br.cond.sptk.many .work_processed_kernel // re-check
1189
1190
.notify:
1191
(pUStk) br.call.spnt.many rp=notify_resume_user
1192
-
.ret10: cmp.ne p6,p0=r0,r0 // p6 <- 0
1193
(pLvSys)br.cond.sptk.few .work_pending_syscall_end
1194
-
br.cond.sptk.many .work_processed_kernel // don't re-check
1195
1196
.work_pending_syscall_end:
1197
adds r2=PT(R8)+16,r12
···
1199
;;
1200
ld8 r8=[r2]
1201
ld8 r10=[r3]
1202
-
br.cond.sptk.many .work_processed_syscall // re-check
1203
1204
END(ia64_leave_kernel)
1205
···
1167
st8 [r2]=r8
1168
st8 [r3]=r10
1169
.work_pending:
1170
+
tbit.z p6,p0=r31,TIF_NEED_RESCHED // is resched not needed?
1171
(p6) br.cond.sptk.few .notify
1172
#ifdef CONFIG_PREEMPT
1173
(pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1
···
1176
#endif
1177
ssm psr.i // enable interrupts
1178
br.call.spnt.many rp=schedule
1179
+
.ret9: cmp.eq p6,p0=r0,r0 // p6 <- 1 (re-check)
1180
rsm psr.i // disable interrupts
1181
;;
1182
#ifdef CONFIG_PREEMPT
···
1185
(pKStk) st4 [r20]=r0 // preempt_count() <- 0
1186
#endif
1187
(pLvSys)br.cond.sptk.few .work_pending_syscall_end
1188
+
br.cond.sptk.many .work_processed_kernel
1189
1190
.notify:
1191
(pUStk) br.call.spnt.many rp=notify_resume_user
1192
+
.ret10: cmp.ne p6,p0=r0,r0 // p6 <- 0 (don't re-check)
1193
(pLvSys)br.cond.sptk.few .work_pending_syscall_end
1194
+
br.cond.sptk.many .work_processed_kernel
1195
1196
.work_pending_syscall_end:
1197
adds r2=PT(R8)+16,r12
···
1199
;;
1200
ld8 r8=[r2]
1201
ld8 r10=[r3]
1202
+
br.cond.sptk.many .work_processed_syscall
1203
1204
END(ia64_leave_kernel)
1205