[PATCH 3.2.x] cobalt/x86: Account for changes to switch_fpu_finish in 5.4.182

[PATCH 3.2.x] cobalt/x86: Account for changes to switch_fpu_finish in 5.4.182

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

The signature of switch_fpu_finish changed in stable 5.4.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/cobalt/arch/x86/ipipe/thread.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/cobalt/arch/x86/ipipe/thread.c b/kernel/cobalt/arch/x86/ipipe/thread.c
index dd97a5d32c..7e28903a42 100644
--- a/kernel/cobalt/arch/x86/ipipe/thread.c
+++ b/kernel/cobalt/arch/x86/ipipe/thread.c
@@ -425,7 +425,9 @@ void xnarch_leave_root(struct xnthread *root)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
 	/* restore current's fpregs */
 	__cpu_invalidate_fpregs_state();
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,182)
+	switch_fpu_finish(current);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
 	switch_fpu_finish(&current->thread.fpu);
 #else
 	switch_fpu_finish(&current->thread.fpu, raw_smp_processor_id());
-- 
2.35.3

Re: [PATCH 3.2.x] cobalt/x86: Account for changes to switch_fpu_finish in 5.4.182

[Jan Kiszka]

On 15.06.22 17:20, Jan Kiszka via Xenomai wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> The signature of switch_fpu_finish changed in stable 5.4.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  kernel/cobalt/arch/x86/ipipe/thread.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/cobalt/arch/x86/ipipe/thread.c b/kernel/cobalt/arch/x86/ipipe/thread.c
> index dd97a5d32c..7e28903a42 100644
> --- a/kernel/cobalt/arch/x86/ipipe/thread.c
> +++ b/kernel/cobalt/arch/x86/ipipe/thread.c
> @@ -425,7 +425,9 @@ void xnarch_leave_root(struct xnthread *root)
>  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
>  	/* restore current's fpregs */
>  	__cpu_invalidate_fpregs_state();
> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,182)
> +	switch_fpu_finish(current);
> +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
>  	switch_fpu_finish(&current->thread.fpu);
>  #else
>  	switch_fpu_finish(&current->thread.fpu, raw_smp_processor_id());

Actually 3.1.x material as well - we already supported 5.4 there.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux