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

[deliverable/linux.git] / arch / mips / include / asm / signal.h

diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
index 2292373ff11ad40ab5de5e448a84a2764e2ec957..23d6b8015c79ac0942e284ddcf9584a4dcb7a0a7 100644 (file)
--- a/arch/mips/include/asm/signal.h
+++ b/arch/mips/include/asm/signal.h
@@ -11,7 +11,7 @@
 
 #include <uapi/asm/signal.h>
 
-#ifdef CONFIG_MIPS32_COMPAT
+#ifdef CONFIG_MIPS32_O32
 extern struct mips_abi mips_abi_32;
 
 #define sig_uses_siginfo(ka, abi)                               \
@@ -19,8 +19,8 @@ extern struct mips_abi mips_abi_32;
                ((ka)->sa.sa_flags & SA_SIGINFO))
 #else
 #define sig_uses_siginfo(ka, abi)                               \
-       (config_enabled(CONFIG_64BIT) ? 1 :                     \
-               (config_enabled(CONFIG_TRAD_SIGNALS) ?          \
+       (IS_ENABLED(CONFIG_64BIT) ? 1 :                     \
+               (IS_ENABLED(CONFIG_TRAD_SIGNALS) ?          \
                        ((ka)->sa.sa_flags & SA_SIGINFO) : 1) )
 #endif