x86: signal: introduce helper macro is_ia32

[sfrench/cifs-2.6.git] / arch / x86 / kernel / signal_32.c

diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index b1bc90f19b9a6e292cd225eb89e8e1ed47251996..cf62f70cc2a6b0b54332e3db77ea1483edaf8346 100644 (file)
--- 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);