Skip to content

Commit

Permalink
Fix CONFIG_X86_DEBUG_FPU build failure
Browse files Browse the repository at this point in the history
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 openzfs#9041
Closes openzfs#9049
  • Loading branch information
behlendorf authored and TulsiJain committed Jul 20, 2019
1 parent 50be9b2 commit e0c977a
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions include/linux/simd_x86.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit e0c977a

Please sign in to comment.