c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

followup: fpu struct initialized member was removed with 5.2

Browse Source 
That's why it was guarded with the "HAVE_KERNEL_FPU_INITIALIZED"
defined in the first place..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-10-02 07:20:53 +02:00
parent 97bcaf4bef
commit 34f271eaf0
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian/patches/0008-SIMD-FPU-register-save-restore-is-also-required-on-5.patch vendored
View File

@ -5,16 +5,16 @@ Subject: [PATCH] [SIMD]: FPU register save/restore is also required on 5.0
kernels kernels
NOTE: the kernel needs to have the copy_kernel_to_xregs_err, NOTE: the kernel needs to have the copy_kernel_to_xregs_err,
copy_kernel_to_fxregs_err and copy_kernel_to_fregs_err funcitons copy_kernel_to_fxregs_err and copy_kernel_to_fregs_err functions
backported for this to work. backported for this to work.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
include/linux/simd_x86.h | 11 +---------- include/linux/simd_x86.h | 11 ++++-------
1 file changed, 1 insertion(+), 10 deletions(-) 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
index edd456098..13aa77345 100644 index edd456098..98503a29e 100644
--- a/include/linux/simd_x86.h --- a/include/linux/simd_x86.h
+++ b/include/linux/simd_x86.h +++ b/include/linux/simd_x86.h
@@ -181,7 +181,6 @@ kfpu_begin(void) @@ -181,7 +181,6 @@ kfpu_begin(void)
@ -25,21 +25,23 @@ index edd456098..13aa77345 100644
/* /*
* The current FPU registers need to be preserved by kfpu_begin() * The current FPU registers need to be preserved by kfpu_begin()
* and restored by kfpu_end(). This is required because we can * and restored by kfpu_end(). This is required because we can
@@ -190,20 +189,13 @@ kfpu_begin(void) @@ -190,11 +189,11 @@ kfpu_begin(void)
* context switch. * context switch.
*/ */
copy_fpregs_to_fpstate(&current->thread.fpu); copy_fpregs_to_fpstate(&current->thread.fpu);
-#elif defined(HAVE_KERNEL_FPU_INITIALIZED) -#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
- /* +
+
+#if defined(HAVE_KERNEL_FPU_INITIALIZED)
/*
- * There is no need to preserve and restore the FPU registers. - * There is no need to preserve and restore the FPU registers.
- * They will always be restored from the task's stored FPU state - * They will always be restored from the task's stored FPU state
- * when switching contexts. - * when switching contexts.
- */ + * Was removed with 5.2 as it was always set to 1 there
+ */
WARN_ON_ONCE(current->thread.fpu.initialized == 0); WARN_ON_ONCE(current->thread.fpu.initialized == 0);
-#endif #endif
} @@ -203,7 +202,6 @@ kfpu_begin(void)
static inline void static inline void
kfpu_end(void) kfpu_end(void)
{ {
@ -47,7 +49,7 @@ index edd456098..13aa77345 100644
union fpregs_state *state = &current->thread.fpu.state; union fpregs_state *state = &current->thread.fpu.state;
int error; int error;
@@ -215,7 +207,6 @@ kfpu_end(void) @@ -215,7 +213,6 @@ kfpu_end(void)
error = copy_kernel_to_fregs_err(&state->fsave); error = copy_kernel_to_fregs_err(&state->fsave);
} }
WARN_ON_ONCE(error); WARN_ON_ONCE(error);