Use v8086_mode inline in fault_32.c, no functional change also ifdef the section for 32-bit only and add to fault_64.c
Signed-off-by: Harvey Harrison <[EMAIL PROTECTED]> --- HPA noted that v8086_mode is always zero on X86_64, no ifdef needed. arch/x86/mm/fault_32.c | 3 ++- arch/x86/mm/fault_64.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index 77915ac..53f4fe4 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c @@ -550,11 +550,12 @@ good_area: /* * 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; } + up_read(&mm->mmap_sem); return; diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c index 84531d8..c05211d 100644 --- a/arch/x86/mm/fault_64.c +++ b/arch/x86/mm/fault_64.c @@ -551,6 +551,16 @@ good_area: tsk->maj_flt++; else tsk->min_flt++; + + /* + * 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; + } + up_read(&mm->mmap_sem); return; -- 1.5.4.rc2.1164.g6451 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/