kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/powerpc/kernel/syscall_64.c
..
..
@@ -193,7 +193,7 @@
193
193
 	ti_flags = READ_ONCE(*ti_flagsp);
194
194
 	while (unlikely(ti_flags & (_TIF_USER_WORK_MASK & ~_TIF_RESTORE_TM))) {
195
195
 		local_irq_enable();
196
-		if (ti_flags & _TIF_NEED_RESCHED_MASK) {
196
+		if (ti_flags & _TIF_NEED_RESCHED) {
197
197
 			schedule();
198
198
 		} else {
199
199
 			/*
..
..
@@ -277,7 +277,7 @@
277
277
 	ti_flags = READ_ONCE(*ti_flagsp);
278
278
 	while (unlikely(ti_flags & (_TIF_USER_WORK_MASK & ~_TIF_RESTORE_TM))) {
279
279
 		local_irq_enable(); /* returning to user: may enable */
280
-		if (ti_flags & _TIF_NEED_RESCHED_MASK) {
280
+		if (ti_flags & _TIF_NEED_RESCHED) {
281
281
 			schedule();
282
282
 		} else {
283
283
 			if (ti_flags & _TIF_SIGPENDING)
..
..
@@ -361,14 +361,10 @@
361
361
 		/* Returning to a kernel context with local irqs enabled. */
362
362
 		WARN_ON_ONCE(!(regs->msr & MSR_EE));
363
363
 again:
364
-		if (IS_ENABLED(CONFIG_PREEMPTION)) {
364
+		if (IS_ENABLED(CONFIG_PREEMPT)) {
365
365
 			/* Return to preemptible kernel context */
366
366
 			if (unlikely(*ti_flagsp & _TIF_NEED_RESCHED)) {
367
367
 				if (preempt_count() == 0)
368
-					preempt_schedule_irq();
369
-			} else if (unlikely(*ti_flagsp & _TIF_NEED_RESCHED_LAZY)) {
370
-				if ((preempt_count() == 0) &&
371
-				    (current_thread_info()->preempt_lazy_count == 0))
372
368
 					preempt_schedule_irq();
373
369
 			}
374
370
 		}