diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-30 13:33:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:23 +0100 |
| commit | d729ab35ee1367b7690458ae9e050571cb055bd3 (patch) | |
| tree | 4517ffe933ac66b3bea3e67b13735e099048015a /arch/x86 | |
| parent | 5f5cd8fd60c71ce47d2ce4e60e7ccbc306e91c64 (diff) | |
| download | blackbird-op-linux-d729ab35ee1367b7690458ae9e050571cb055bd3.tar.gz blackbird-op-linux-d729ab35ee1367b7690458ae9e050571cb055bd3.zip | |
x86: use v8086_mode helper, trivial unification
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 <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/fault_32.c | 4 | ||||
| -rw-r--r-- | arch/x86/mm/fault_64.c | 11 |
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; |
