kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/powerpc/kernel/entry_32.S
..
..
@@ -414,9 +414,7 @@
414
414
 	mtmsr	r10
415
415
 	lwz	r9,TI_FLAGS(r2)
416
416
 	li	r8,-MAX_ERRNO
417
-	lis	r0,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)@h
418
-	ori	r0,r0, (_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)@l
419
-	and.	r0,r9,r0
417
+	andi.	r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)
420
418
 	bne-	syscall_exit_work
421
419
 	cmplw	0,r3,r8
422
420
 	blt+	syscall_exit_cont
..
..
@@ -532,13 +530,13 @@
532
530
 	b	syscall_dotrace_cont
533
531
 
534
532
 syscall_exit_work:
535
-	andis.	r0,r9,_TIF_RESTOREALL@h
533
+	andi.	r0,r9,_TIF_RESTOREALL
536
534
 	beq+	0f
537
535
 	REST_NVGPRS(r1)
538
536
 	b	2f
539
537
 0:	cmplw	0,r3,r8
540
538
 	blt+	1f
541
-	andis.	r0,r9,_TIF_NOERROR@h
539
+	andi.	r0,r9,_TIF_NOERROR
542
540
 	bne-	1f
543
541
 	lwz	r11,_CCR(r1)			/* Load CR */
544
542
 	neg	r3,r3
..
..
@@ -547,12 +545,12 @@
547
545
 
548
546
 1:	stw	r6,RESULT(r1)	/* Save result */
549
547
 	stw	r3,GPR3(r1)	/* Update return value */
550
-2:	andis.	r0,r9,(_TIF_PERSYSCALL_MASK)@h
548
+2:	andi.	r0,r9,(_TIF_PERSYSCALL_MASK)
551
549
 	beq	4f
552
550
 
553
551
 	/* Clear per-syscall TIF flags if any are set.  */
554
552
 
555
-	lis	r11,(_TIF_PERSYSCALL_MASK)@h
553
+	li	r11,_TIF_PERSYSCALL_MASK
556
554
 	addi	r12,r2,TI_FLAGS
557
555
 3:	lwarx	r8,0,r12
558
556
 	andc	r8,r8,r11
..
..
@@ -929,14 +927,7 @@
929
927
 	cmpwi	0,r0,0		/* if non-zero, just restore regs and return */
930
928
 	bne	restore_kuap
931
929
 	andi.	r8,r8,_TIF_NEED_RESCHED
932
-	bne+	1f
933
-	lwz	r0,TI_PREEMPT_LAZY(r2)
934
-	cmpwi	0,r0,0          /* if non-zero, just restore regs and return */
935
-	bne	restore_kuap
936
-	lwz	r0,TI_FLAGS(r2)
937
-	andi.	r0,r0,_TIF_NEED_RESCHED_LAZY
938
930
 	beq+	restore_kuap
939
-1:
940
931
 	lwz	r3,_MSR(r1)
941
932
 	andi.	r0,r3,MSR_EE	/* interrupts off? */
942
933
 	beq	restore_kuap	/* don't schedule if so */
..
..
@@ -1257,7 +1248,7 @@
1257
1248
 #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
1258
1249
 
1259
1250
 do_work:			/* r10 contains MSR_KERNEL here */
1260
-	andi.	r0,r9,_TIF_NEED_RESCHED_MASK
1251
+	andi.	r0,r9,_TIF_NEED_RESCHED
1261
1252
 	beq	do_user_signal
1262
1253
 
1263
1254
 do_resched:			/* r10 contains MSR_KERNEL here */
..
..
@@ -1276,7 +1267,7 @@
1276
1267
 	LOAD_REG_IMMEDIATE(r10,MSR_KERNEL)
1277
1268
 	mtmsr	r10		/* disable interrupts */
1278
1269
 	lwz	r9,TI_FLAGS(r2)
1279
-	andi.	r0,r9,_TIF_NEED_RESCHED_MASK
1270
+	andi.	r0,r9,_TIF_NEED_RESCHED
1280
1271
 	bne-	do_resched
1281
1272
 	andi.	r0,r9,_TIF_USER_WORK_MASK
1282
1273
 	beq	restore_user