From: Shida Zhang <zhangshida@xxxxxxxxxx> Undefine and redefine cpu_has_fpu to 0 when it is overridden with the "nofpu" option. Suggested-by: Maciej W. Rozycki <macro@xxxxxxxxxxx> Signed-off-by: Shida Zhang <zhangshida@xxxxxxxxxx> --- Changelog in v1 -> v2: - Choose to redefine cpu_has_fpu to solve the problem. arch/mips/include/asm/cpu-features.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index de8cb2ccb781..38eb469008b6 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h @@ -134,6 +134,10 @@ # endif #else # define raw_cpu_has_fpu cpu_has_fpu +# ifndef CONFIG_MIPS_FP_SUPPORT +# undef cpu_has_fpu +# define cpu_has_fpu 0 +# endif #endif #ifndef cpu_has_32fpr #define cpu_has_32fpr __isa_ge_or_opt(1, MIPS_CPU_32FPR) -- 2.30.2
