From 5ad592b5f193909ec9a2a9627c2b9de32fa28481 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf 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 Signed-off-by: Brian Behlendorf Closes #9041 Closes #9049 Signed-off-by: Thomas Lamprecht --- 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 d1ded3af2d16..b32bccc4139b 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 #include