From 88f877e07def90a2c77106b86802b143ca8f97b3 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 27 Jan 2021 21:25:20 +0100 Subject: [PATCH] kernelPatches: drop export_kernel_fpu_functions Hasn't been necessary since ZFS 0.8.3 --- .../export_kernel_fpu_functions_4_14.patch | 60 ------------------- .../export_kernel_fpu_functions_5_3.patch | 42 ------------- pkgs/os-specific/linux/kernel/patches.nix | 11 ---- pkgs/top-level/all-packages.nix | 9 --- 4 files changed, 122 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch delete mode 100644 pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch deleted file mode 100644 index 205497aee2d..00000000000 --- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_4_14.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 245e0f743d814c9ff2d1c748175e321301eb16cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export __kernel_fpu_{begin,end}() - -This partially undo commit: - -12209993 x86/fpu: Don't export __kernel_fpu_{begin,end}() - -We need this symbol in zfs for AES-NI/AVX support. ---- - arch/x86/include/asm/fpu/api.h | 2 ++ - arch/x86/kernel/fpu/core.c | 6 ++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h -index b56d504af6545..7d53388d266ea 100644 ---- a/arch/x86/include/asm/fpu/api.h -+++ b/arch/x86/include/asm/fpu/api.h -@@ -18,6 +18,8 @@ - * If you intend to use the FPU in softirq you need to check first with - * irq_fpu_usable() if it is possible. - */ -+extern void __kernel_fpu_begin(void); -+extern void __kernel_fpu_end(void); - extern void kernel_fpu_begin(void); - extern void kernel_fpu_end(void); - extern bool irq_fpu_usable(void); -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 2e5003fef51a9..2ea85b32421a0 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -93,7 +93,7 @@ bool irq_fpu_usable(void) - } - EXPORT_SYMBOL(irq_fpu_usable); - --static void __kernel_fpu_begin(void) -+void __kernel_fpu_begin(void) - { - struct fpu *fpu = ¤t->thread.fpu; - -@@ -111,8 +111,9 @@ static void __kernel_fpu_begin(void) - __cpu_invalidate_fpregs_state(); - } - } -+EXPORT_SYMBOL(__kernel_fpu_begin); - --static void __kernel_fpu_end(void) -+void __kernel_fpu_end(void) - { - struct fpu *fpu = ¤t->thread.fpu; - -@@ -121,6 +122,7 @@ static void __kernel_fpu_end(void) - - kernel_fpu_enable(); - } -+EXPORT_SYMBOL(__kernel_fpu_end); - - void kernel_fpu_begin(void) - { diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch deleted file mode 100644 index dc9ca64bdc1..00000000000 --- a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with - EXPORT_SYMBOL_GPL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need these symbols in zfs as the fpu implementation breaks userspace: - -https://github.com/zfsonlinux/zfs/issues/9346 -Signed-off-by: Jörg Thalheim ---- - arch/x86/kernel/fpu/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 12c70840980e..352538b3bb5d 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -102,7 +102,7 @@ void kernel_fpu_begin(void) - } - __cpu_invalidate_fpregs_state(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_begin); -+EXPORT_SYMBOL(kernel_fpu_begin); - - void kernel_fpu_end(void) - { -@@ -111,7 +111,7 @@ void kernel_fpu_end(void) - this_cpu_write(in_kernel_fpu, false); - preempt_enable(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_end); -+EXPORT_SYMBOL(kernel_fpu_end); - - /* - * Save the FPU state (mark it for reload if necessary): --- -2.23.0 - diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e7667bf1bc2..c185f60349a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -79,17 +79,6 @@ patch = ./rtl8761b-support.patch; }; - export_kernel_fpu_functions = { - "4.14" = { - name = "export_kernel_fpu_functions"; - patch = ./export_kernel_fpu_functions_4_14.patch; - }; - "5.3" = { - name = "export_kernel_fpu_functions"; - patch = ./export_kernel_fpu_functions_5_3.patch; - }; - }; - export-rt-sched-migrate = { name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf367ccbea5..7e41ffac779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18940,7 +18940,6 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" ]; }; @@ -18949,7 +18948,6 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" ]; }; @@ -18958,7 +18956,6 @@ in kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18966,7 +18963,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18974,7 +18970,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18982,7 +18977,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18990,7 +18984,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" kernelPatches.export-rt-sched-migrate ]; }; @@ -19021,7 +19014,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -19029,7 +19021,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" ]; };