Commit 21a03431 authored by fluffykittyrevenge's avatar fluffykittyrevenge Committed by Etienne Juvigny

linux54-rc-tkg: Reintroduce ZFS fix (#344)

* linux54-rc-tkg: Reintroduce ZFS fix

Uses the same patch that linux53-tkg is using.  Changed CONDITION11 to
CONDITIONZFS to make it more future portable and because the CONDITION## format
is a bit difficult follow between kernel versions.

[Ticket: None]

* Delete nativeopt-when-using-dxvk-win32-thread-model-support.dxvkpatch

That shouldn't have been there
parent 7edf2755
......@@ -109,6 +109,7 @@ source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
# 0005-v5.4_undead-pds099o.patch
# 0006-add-acs-overrides_iommu.patch
0007-v5.4-fsync.patch
0011-ZFS-fix.patch
)
sha256sums=('c50d29a05e5d8deea6c6bd3478ca7f13170febe928436e1fad49a11bc359e9c2'
'67c347ddaedbe693f4a06c787bc624a57c2e0752b465b2fda0ae2f1b6223d64f'
......@@ -119,7 +120,8 @@ sha256sums=('c50d29a05e5d8deea6c6bd3478ca7f13170febe928436e1fad49a11bc359e9c2'
'6b338201e5282f0c6e05ccc01f4d7c6b3ec57af12d768e40db8f095b7f3f6ea6'
'0b573448785ff940b3f4cf41e3598c9c816ec3541e494f0d6bbcd48d6cfdd0cb'
'7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
'2d9260b80b43bbd605cf420d6bd53aa7262103dfd77196ba590ece5600b6dc0d')
'2d9260b80b43bbd605cf420d6bd53aa7262103dfd77196ba590ece5600b6dc0d'
'39be7492e3288179c8d90e906cef6d1f4d1db9d787b1093325a786ead854edc3')
# Community patches
if [ -n "$_community_patches" ]; then
......@@ -647,6 +649,17 @@ prepare() {
if [ "$CONDITION9" == "y" ] || [ "$_fsync" == "true" ]; then
patch -Np1 -i ../0007-v5.4-fsync.patch
fi
# ZFS fix
if [ -z "$_zfsfix" ]; then
plain ""
plain "Add back missing symbol for AES-NI/AVX support on ZFS"
plain "https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch"
read -rp "`echo $' > N/y : '`" CONDITIONZFS;
fi
if [ "$CONDITIONZFS" == "y" ] || [ "$_zfsfix" == "true" ]; then
patch -Np1 -i ../0011-ZFS-fix.patch
fi
# userpatches
if [ "$_user_patches" == "true" ]; then
......
......@@ -62,6 +62,9 @@ _voluntary_preempt=""
# Set to "true" to enable Device Tree and Open Firmware support. If you don't know about it, you don't need it - Default is "false"
_OFenable="false"
# Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false"
_zfsfix="false"
# Set to "true" to enable support for fsync, an experimental replacement for esync found in Valve Proton 4.11+ - https://steamcommunity.com/games/221410/announcements/detail/2957094910196249305
_fsync=""
......
From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
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 <joerg@thalheim.io>
---
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment