From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/arch/powerpc/kernel/syscall_64.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/kernel/arch/powerpc/kernel/syscall_64.c b/kernel/arch/powerpc/kernel/syscall_64.c
index ae3212d..310bcd7 100644
--- a/kernel/arch/powerpc/kernel/syscall_64.c
+++ b/kernel/arch/powerpc/kernel/syscall_64.c
@@ -193,7 +193,7 @@
ti_flags = READ_ONCE(*ti_flagsp);
while (unlikely(ti_flags & (_TIF_USER_WORK_MASK & ~_TIF_RESTORE_TM))) {
local_irq_enable();
- if (ti_flags & _TIF_NEED_RESCHED_MASK) {
+ if (ti_flags & _TIF_NEED_RESCHED) {
schedule();
} else {
/*
@@ -277,7 +277,7 @@
ti_flags = READ_ONCE(*ti_flagsp);
while (unlikely(ti_flags & (_TIF_USER_WORK_MASK & ~_TIF_RESTORE_TM))) {
local_irq_enable(); /* returning to user: may enable */
- if (ti_flags & _TIF_NEED_RESCHED_MASK) {
+ if (ti_flags & _TIF_NEED_RESCHED) {
schedule();
} else {
if (ti_flags & _TIF_SIGPENDING)
@@ -361,14 +361,10 @@
/* Returning to a kernel context with local irqs enabled. */
WARN_ON_ONCE(!(regs->msr & MSR_EE));
again:
- if (IS_ENABLED(CONFIG_PREEMPTION)) {
+ if (IS_ENABLED(CONFIG_PREEMPT)) {
/* Return to preemptible kernel context */
if (unlikely(*ti_flagsp & _TIF_NEED_RESCHED)) {
if (preempt_count() == 0)
- preempt_schedule_irq();
- } else if (unlikely(*ti_flagsp & _TIF_NEED_RESCHED_LAZY)) {
- if ((preempt_count() == 0) &&
- (current_thread_info()->preempt_lazy_count == 0))
preempt_schedule_irq();
}
}
--
Gitblit v1.6.2