summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--0004-export_kernel_fpu_functions.patch60
-rw-r--r--PKGBUILD16
3 files changed, 81 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 777fe777a67..525e545d2e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Fri Jul 5 20:50:00 UTC 2019
+# Thu Jul 11 01:18:46 UTC 2019
pkgbase = linux-lts414
- pkgver = 4.14.132
+ pkgver = 4.14.133
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -13,29 +13,32 @@ pkgbase = linux-lts414
makedepends = libelf
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.132.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.133.xz
source = config
source = 60-linux.hook
source = 90-linux.hook
source = linux-lts.preset
source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
+ source = 0004-export_kernel_fpu_functions.patch
md5sums = bacdb9ffdcd922aa069a5e1520160e24
- md5sums = 09ccda3ae4a855176e9b97326af9012a
+ md5sums = 636afd0a0e839bc7b8c5f7449e222d4d
md5sums = d25ac6fb204de05284286fddacc74247
md5sums = ce6c81ad1ad1f8b333fd6077d47abdaf
md5sums = a85bfae59eb537b973c388ffadb281ff
md5sums = a329f9581060d555dc7358483de9760a
md5sums = 53523555d234de3b2fde749096ba9948
md5sums = 95204750f94a5f6d2d19e021736265d5
+ md5sums = f7d76cdef5cf4ac6a49115fc4f1f35d5
sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
- sha256sums = e991029c6d43fe4e08bc21f1fd1ea6e58032785ac212afe8b566f1dde4eb1964
+ sha256sums = 12014642d928d76ba349895b5c8be39228851bc99b80f86e22f35730170ec4fd
sha256sums = 110d716c119321de712640d683124042ddcbdcac5222645c1b2620a99dd1b00a
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98
sha256sums = b6c56ff2dffebe164941ac3428351e158c9c059e884057ecfc215eeea12e76eb
+ sha256sums = caba7945805b1ade42e42d2f981ccdd8791c76f39166212f7970a78057582474
pkgname = linux-lts414
pkgdesc = The Linux-lts414 kernel and modules
@@ -45,12 +48,12 @@ pkgname = linux-lts414
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = linux=4.14.132
+ provides = linux=4.14.133
backup = etc/mkinitcpio.d/linux-lts414.preset
pkgname = linux-lts414-headers
pkgdesc = Header files and scripts for building modules for Linux-lts414 kernel
- provides = linux-headers=4.14.132
+ provides = linux-headers=4.14.133
pkgname = linux-lts414-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-lts414 kernel
diff --git a/0004-export_kernel_fpu_functions.patch b/0004-export_kernel_fpu_functions.patch
new file mode 100644
index 00000000000..205497aee2d
--- /dev/null
+++ b/0004-export_kernel_fpu_functions.patch
@@ -0,0 +1,60 @@
+From 245e0f743d814c9ff2d1c748175e321301eb16cf 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}()
+
+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 = &current->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 = &current->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/PKGBUILD b/PKGBUILD
index bc7faca12a5..381117bed0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
set -u
pkgbase="linux-lts414"
-pkgver="4.14.132"
+pkgver="4.14.133"
_srcname="linux-${pkgver%.*}"
pkgrel='1'
arch=('x86_64')
@@ -21,6 +21,7 @@ source=(
'linux-lts.preset' # standard config files for mkinitcpio ramdisk
'0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
'0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch'
+ '0004-export_kernel_fpu_functions.patch'
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds@linux-foundation.org>
@@ -28,21 +29,23 @@ validpgpkeys=(
)
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
md5sums=('bacdb9ffdcd922aa069a5e1520160e24'
- '09ccda3ae4a855176e9b97326af9012a'
+ '636afd0a0e839bc7b8c5f7449e222d4d'
'd25ac6fb204de05284286fddacc74247'
'ce6c81ad1ad1f8b333fd6077d47abdaf'
'a85bfae59eb537b973c388ffadb281ff'
'a329f9581060d555dc7358483de9760a'
'53523555d234de3b2fde749096ba9948'
- '95204750f94a5f6d2d19e021736265d5')
+ '95204750f94a5f6d2d19e021736265d5'
+ 'f7d76cdef5cf4ac6a49115fc4f1f35d5')
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
- 'e991029c6d43fe4e08bc21f1fd1ea6e58032785ac212afe8b566f1dde4eb1964'
+ '12014642d928d76ba349895b5c8be39228851bc99b80f86e22f35730170ec4fd'
'110d716c119321de712640d683124042ddcbdcac5222645c1b2620a99dd1b00a'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98'
- 'b6c56ff2dffebe164941ac3428351e158c9c059e884057ecfc215eeea12e76eb')
+ 'b6c56ff2dffebe164941ac3428351e158c9c059e884057ecfc215eeea12e76eb'
+ 'caba7945805b1ade42e42d2f981ccdd8791c76f39166212f7970a78057582474')
_kernelname=${pkgbase#linux}
@@ -75,6 +78,9 @@ prepare() {
# https://bugs.archlinux.org/task/56711
patch -Nup1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
+ # https://github.com/NixOS/nixpkgs/pull/61076
+ patch -Nup1 -i '../0004-export_kernel_fpu_functions.patch'
+
# Local or private patches
shopt -s nullglob
local _lpatch