forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f 
 kernel/arch/powerpc/kernel/exceptions-64e.S
....@@ -1080,7 +1080,7 @@
10801080 	li	r10, -1
10811081 	mtspr	SPRN_DBSR,r10
10821082 	b	restore
1083
-1:	andi.	r0,r4,_TIF_NEED_RESCHED_MASK
1083
+1:	andi.	r0,r4,_TIF_NEED_RESCHED
10841084 	beq	2f
10851085 	bl	restore_interrupts
10861086 	SCHEDULE_USER
....@@ -1132,20 +1132,12 @@
11321132 	bne-	0b
11331133 1:
11341134 
1135
-#ifdef CONFIG_PREEMPTION
1135
+#ifdef CONFIG_PREEMPT
11361136 	/* Check if we need to preempt */
1137
-	lwz	r8,TI_PREEMPT(r9)
1138
-	cmpwi	0,r8,0		/* if non-zero, just restore regs and return */
1139
-	bne	restore
11401137 	andi.	r0,r4,_TIF_NEED_RESCHED
1141
-	bne+	check_count
1142
-
1143
-	andi.	r0,r4,_TIF_NEED_RESCHED_LAZY
11441138 	beq+	restore
1145
-	lwz	r8,TI_PREEMPT_LAZY(r9)
1146
-
11471139 	/* Check that preempt_count() == 0 and interrupts are enabled */
1148
-check_count:
1140
+	lwz	r8,TI_PREEMPT(r9)
11491141 	cmpwi	cr0,r8,0
11501142 	bne	restore
11511143 	ld	r0,SOFTE(r1)
....@@ -1166,7 +1158,7 @@
11661158 	 * interrupted after loading SRR0/1.
11671159 	 */
11681160 	wrteei	0
1169
-#endif /* CONFIG_PREEMPTION */
1161
+#endif /* CONFIG_PREEMPT */
11701162 
11711163 restore:
11721164 	/*