2 files changed, 14 insertions, 1 deletions

diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 276863dc4bdd..93ede2dde958 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -475,14 +475,16 @@ good_area:
         else
                 tsk->min_flt++;
 
+#ifdef CONFIG_X86_32
         /*
          * Did it hit the DOS screen memory VA from vm86 mode?
          */
-        if (regs->flags & VM_MASK) {
+        if (v8086_mode(regs)) {
                 unsigned long bit = (address - 0xA0000) >> PAGE_SHIFT;
                 if (bit < 32)
                         tsk->thread.screen_bitmap |= 1 << bit;
         }
+#endif
         up_read(&mm->mmap_sem);
         return;
 
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 9ef0306efe9e..2d9e6da2cb30 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -514,6 +514,17 @@ good_area:
                 tsk->maj_flt++;
         else
                 tsk->min_flt++;
+
+#ifdef CONFIG_X86_32
+        /*
+         * Did it hit the DOS screen memory VA from vm86 mode?
+         */
+        if (v8086_mode(regs)) {
+                unsigned long bit = (address - 0xA0000) >> PAGE_SHIFT;
+                if (bit < 32)
+                        tsk->thread.screen_bitmap |= 1 << bit;
+        }
+#endif
         up_read(&mm->mmap_sem);
         return;