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/x86/include/asm/fpu/api.h | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/kernel/arch/x86/include/asm/fpu/api.h b/kernel/arch/x86/include/asm/fpu/api.h index d31b088..8b9bfaa 100644 --- a/kernel/arch/x86/include/asm/fpu/api.h +++ b/kernel/arch/x86/include/asm/fpu/api.h @@ -28,7 +28,6 @@ extern void kernel_fpu_end(void); extern bool irq_fpu_usable(void); extern void fpregs_mark_activate(void); -extern void kernel_fpu_resched(void); /* Code that is unaware of kernel_fpu_begin_mask() can use this */ static inline void kernel_fpu_begin(void) @@ -41,32 +40,17 @@ * A context switch will (and softirq might) save CPU's FPU registers to * fpu->state and set TIF_NEED_FPU_LOAD leaving CPU's FPU registers in * a random state. - * - * local_bh_disable() protects against both preemption and soft interrupts - * on !RT kernels. - * - * On RT kernels local_bh_disable() is not sufficient because it only - * serializes soft interrupt related sections via a local lock, but stays - * preemptible. Disabling preemption is the right choice here as bottom - * half processing is always in thread context on RT kernels so it - * implicitly prevents bottom half processing as well. - * - * Disabling preemption also serializes against kernel_fpu_begin(). */ static inline void fpregs_lock(void) { - if (!IS_ENABLED(CONFIG_PREEMPT_RT)) - local_bh_disable(); - else - preempt_disable(); + preempt_disable(); + local_bh_disable(); } static inline void fpregs_unlock(void) { - if (!IS_ENABLED(CONFIG_PREEMPT_RT)) - local_bh_enable(); - else - preempt_enable(); + local_bh_enable(); + preempt_enable(); } #ifdef CONFIG_X86_DEBUG_FPU -- Gitblit v1.6.2