Merge branch 'master' of /home/aia21/ntfs-2.6/

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index 963616d364ec..5c352c3a9e7f 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -123,7 +123,8 @@ 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_OF | X86_EFLAGS_DF | \
+#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)
 
@@ -582,9 +583,6 @@ static void fastcall do_signal(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        if (try_to_freeze())
-                goto no_signal;
-
         if (test_thread_flag(TIF_RESTORE_SIGMASK))
                 oldset = &current->saved_sigmask;
         else
@@ -613,7 +611,6 @@ static void fastcall do_signal(struct pt_regs *regs)
                 return;
         }
 
-no_signal:
         /* Did we come from a system call? */
         if (regs->orig_eax >= 0) {
                 /* Restart the system call - no handlers present */