Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[deliverable/linux.git] / arch / mips / kernel / elf.c

diff --git a/arch/mips/kernel/elf.c b/arch/mips/kernel/elf.c
index 824b0373ba7111785ff8a3dcab557b8a8ec3694c..6430bff21fff80a7bb6647c6af0198364cac7bdd 100644 (file)
--- a/arch/mips/kernel/elf.c
+++ b/arch/mips/kernel/elf.c
@@ -182,7 +182,7 @@ int arch_check_elf(void *_ehdr, bool has_interpreter, void *_interp_ehdr,
                        return -ELIBBAD;
        }
 
-       if (!config_enabled(CONFIG_MIPS_O32_FP64_SUPPORT))
+       if (!IS_ENABLED(CONFIG_MIPS_O32_FP64_SUPPORT))
                return 0;
 
        fp_abi = state->fp_abi;
@@ -288,7 +288,7 @@ void mips_set_personality_fp(struct arch_elf_state *state)
         * not be worried about N32/N64 binaries.
         */
 
-       if (!config_enabled(CONFIG_MIPS_O32_FP64_SUPPORT))
+       if (!IS_ENABLED(CONFIG_MIPS_O32_FP64_SUPPORT))
                return;
 
        switch (state->overall_fp_mode) {