8f11c72175
github pull-request #9406[0]. [0]: https://github.com/zfsonlinux/zfs/pull/9406#event-2704412478 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
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
|
|
|
|
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
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@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 d1ded3af2..b32bccc41 100644
|
|
--- a/include/linux/simd_x86.h
|
|
+++ b/include/linux/simd_x86.h
|
|
@@ -84,6 +84,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>
|