On Mon, 2022-05-16 at 23:32 +0800, Jamie Huang via Xenomai wrote:
> From: Jamie <[email protected]>
It's up to Jan but I guess a complete name would be nice here. Same
fore the Signed-off-by below.
>
> In v5.18-evl-rebase, function kernel_fpu_disabled() has been removed in
> commit 59f5ede3bc0f("x86/fpu: Prevent FPU state corruption"), so we will
> get compile error when CONFIG_DOVETAIL is enabled:
> arch/x86/kernel/fpu/core.c:931:6: error: implicit declaration of function
> ‘kernel_fpu_disabled’; did you mean ‘perf_pmu_disable’?
> [-Werror=implicit-function-declaration]
> if (kernel_fpu_disabled()) {
> ^~~~~~~~~~~~~~~~~~~
> perf_pmu_disable
> cc1: all warnings being treated as errors
> So, fix it.
>
> Signed-off-by: Jamie <[email protected]>
> ---
> arch/x86/kernel/fpu/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
> index 6a0d1e7f278f..c3adbbb73226 100644
> --- a/arch/x86/kernel/fpu/core.c
> +++ b/arch/x86/kernel/fpu/core.c
> @@ -928,7 +928,7 @@ void fpu__suspend_inband(void)
> * preemption of an inband kernel context currently using the
> * fpu by a thread which resumes on the oob stage.
> */
> - if (kernel_fpu_disabled()) {
> + if (this_cpu_read(in_kernel_fpu)) {
> save_fpregs_to_fpstate(kfpu);
> __cpu_invalidate_fpregs_state();
> oob_fpu_set_preempt(&tsk->thread.fpu);
Reviewed-By: Florian Bezdeka <[email protected]>
I noticed that while investigating the FPU test issue that I already
reported, but missed that we already have a dovetail branch which is
affected.
Non-Git reference would be
https://lore.kernel.org/lkml/[email protected]/
Best regards,
Florian Bezdeka
