x86: signal: introduce helper macro is_ia32

Introduce new macro is_ia32 for unification of setup_rt_frame().
No effect in binary, compiler will optimize.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 9 insertions, 4 deletions

diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index b1bc90f19b9a..cf62f70cc2a6 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -491,6 +491,8 @@ static int signr_convert(int sig)
         return sig;
 }
 
+#define is_ia32 1
+
 static int
 setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                sigset_t *set, struct pt_regs *regs)
@@ -499,10 +501,13 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         int ret;
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = __setup_rt_frame(usig, ka, info, set, regs);
-        else
-                ret = __setup_frame(usig, ka, set, regs);
+        if (is_ia32) {
+                if (ka->sa.sa_flags & SA_SIGINFO)
+                        ret = __setup_rt_frame(usig, ka, info, set, regs);
+                else
+                        ret = __setup_frame(usig, ka, set, regs);
+        } else
+                ret = __setup_rt_frame(sig, ka, info, set, regs);
 
         if (ret) {
                 force_sigsegv(sig, current);