1 files changed, 5 insertions, 1 deletions

diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index ec0f68ce6886..2daa06fb4a88 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -542,7 +542,7 @@ void handle_vm86_fault(struct kernel_vm86_regs * regs, long error_code)
         unsigned char opcode;
         unsigned char __user *csp;
         unsigned char __user *ssp;
-        unsigned short ip, sp;
+        unsigned short ip, sp, orig_flags;
         int data32, pref_done;
 
 #define CHECK_IF_IN_TRAP \
@@ -551,8 +551,12 @@ void handle_vm86_fault(struct kernel_vm86_regs * regs, long error_code)
 #define VM86_FAULT_RETURN do { \
         if (VMPI.force_return_for_pic  && (VEFLAGS & (IF_MASK | VIF_MASK))) \
                 return_to_32bit(regs, VM86_PICRETURN); \
+        if (orig_flags & TF_MASK) \
+                handle_vm86_trap(regs, 0, 1); \
         return; } while (0)
 
+        orig_flags = *(unsigned short *)&regs->eflags;
+
         csp = (unsigned char __user *) (regs->cs << 4);
         ssp = (unsigned char __user *) (regs->ss << 4);
         sp = SP(regs);