Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / x86 / kernel / signal.c

diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 69562992e457456eaa4a861de85f6faf4eba8278..cf913587d4dd3674fe1f04ab8588e805fc7caa85 100644 (file)
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -43,12 +43,6 @@
 
 #include <asm/sigframe.h>
 
-#ifdef CONFIG_X86_32
-# define FIX_EFLAGS    (__FIX_EFLAGS | X86_EFLAGS_RF)
-#else
-# define FIX_EFLAGS    __FIX_EFLAGS
-#endif
-
 #define COPY(x)                        do {                    \
        get_user_ex(regs->x, &sc->x);                   \
 } while (0)
@@ -668,15 +662,17 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)
        if (!failed) {
                /*
                 * Clear the direction flag as per the ABI for function entry.
-                */
-               regs->flags &= ~X86_EFLAGS_DF;
-               /*
+                *
+                * Clear RF when entering the signal handler, because
+                * it might disable possible debug exception from the
+                * signal handler.
+                *
                 * Clear TF when entering the signal handler, but
                 * notify any tracer that was single-stepping it.
                 * The tracer may want to single-step inside the
                 * handler too.
                 */
-               regs->flags &= ~X86_EFLAGS_TF;
+               regs->flags &= ~(X86_EFLAGS_DF|X86_EFLAGS_RF|X86_EFLAGS_TF);
        }
        signal_setup_done(failed, ksig, test_thread_flag(TIF_SINGLESTEP));
 }