x86: Use FIX_EFLAGS define in X86_64

[ tglx@linutronix.de: simplified ]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 11 insertions, 5 deletions

diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 182269b752da..9eb23fb66b1e 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -30,6 +30,17 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+#define __FIX_EFLAGS    (X86_EFLAGS_AC | X86_EFLAGS_OF | \
+                         X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
+                         X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
+                         X86_EFLAGS_CF)
+
+#ifdef CONFIG_X86_32
+# define FIX_EFLAGS     (__FIX_EFLAGS | X86_EFLAGS_RF)
+#else
+# define FIX_EFLAGS     __FIX_EFLAGS
+#endif
+
 /*
  * Atomically swap in the new signal mask, and wait for a signal.
  */
@@ -122,11 +133,6 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax
           err |= __get_user(tmp, &sc->seg);                             \
           loadsegment(seg,tmp); }
 
-#define FIX_EFLAGS      (X86_EFLAGS_AC | X86_EFLAGS_RF |                 \
-                         X86_EFLAGS_OF | X86_EFLAGS_DF |                 \
-                         X86_EFLAGS_TF | X86_EFLAGS_SF | X86_EFLAGS_ZF | \
-                         X86_EFLAGS_AF | X86_EFLAGS_PF | X86_EFLAGS_CF)
-
         GET_SEG(gs);
         COPY_SEG(fs);
         COPY_SEG(es);