cherry-pick SIMD compat patches
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
parent
ee9e6a91e5
commit
f43dbfa752
1615
debian/patches/0008-Linux-5.0-compat-SIMD-compatibility.patch
vendored
Normal file
1615
debian/patches/0008-Linux-5.0-compat-SIMD-compatibility.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
44
debian/patches/0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
vendored
Normal file
44
debian/patches/0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
vendored
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||||
|
Date: Wed, 17 Jul 2019 09:14:36 -0700
|
||||||
|
Subject: [PATCH] Fix CONFIG_X86_DEBUG_FPU build failure
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
When CONFIG_X86_DEBUG_FPU is defined the alternatives_patched symbol
|
||||||
|
is pulled in as a dependency which results in a build failure. To
|
||||||
|
prevent this undefine CONFIG_X86_DEBUG_FPU to disable the WARN_ON_FPU()
|
||||||
|
macro and rely on WARN_ON_ONCE debugging checks which were previously
|
||||||
|
added.
|
||||||
|
|
||||||
|
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
|
||||||
|
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||||
|
Closes #9041
|
||||||
|
Closes #9049
|
||||||
|
(cherry picked from commit 095b5412b31c07cad5cec74a4eb5ace011c92b27)
|
||||||
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||||
|
---
|
||||||
|
include/linux/simd_x86.h | 9 +++++++++
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
|
||||||
|
index 2d7a1c3a5..5f243e0cc 100644
|
||||||
|
--- a/include/linux/simd_x86.h
|
||||||
|
+++ b/include/linux/simd_x86.h
|
||||||
|
@@ -82,6 +82,15 @@
|
||||||
|
|
||||||
|
#if defined(_KERNEL)
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * Disable the WARN_ON_FPU() macro to prevent additional dependencies
|
||||||
|
+ * when providing the kfpu_* functions. Relevant warnings are included
|
||||||
|
+ * as appropriate and are unconditionally enabled.
|
||||||
|
+ */
|
||||||
|
+#if defined(CONFIG_X86_DEBUG_FPU) && !defined(KERNEL_EXPORTS_X86_FPU)
|
||||||
|
+#undef CONFIG_X86_DEBUG_FPU
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if defined(HAVE_KERNEL_FPU_API_HEADER)
|
||||||
|
#include <asm/fpu/api.h>
|
||||||
|
#include <asm/fpu/internal.h>
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -5,3 +5,5 @@
|
|||||||
0005-import-with-d-dev-disk-by-id-in-scan-service.patch
|
0005-import-with-d-dev-disk-by-id-in-scan-service.patch
|
||||||
0006-Enable-zed-emails.patch
|
0006-Enable-zed-emails.patch
|
||||||
0007-Fix-race-in-parallel-mount-s-thread-dispatching-algo.patch
|
0007-Fix-race-in-parallel-mount-s-thread-dispatching-algo.patch
|
||||||
|
0008-Linux-5.0-compat-SIMD-compatibility.patch
|
||||||
|
0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user