diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:39:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:40:02 +0100 |
| commit | 40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f (patch) | |
| tree | 9343f6be910d5ccd6195a68ef9f4c251abc7418c /arch/x86/mm/fault.c | |
| parent | x86/{fault,efi}: Fix and rename efi_recover_from_page_fault() (diff) | |
| parent | x86/Kconfig: Remove HPET_EMULATE_RTC depends on RTC (diff) | |
| download | linux-dev-40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f.tar.xz linux-dev-40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f.zip | |
Merge branch 'x86/cleanups' into x86/mm
Merge recent cleanups to the x86 MM code to resolve a conflict.
Conflicts:
arch/x86/mm/fault.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 7b3a125e1e98..525197381baa 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -282,25 +282,6 @@ void arch_sync_kernel_mappings(unsigned long start, unsigned long end) } } -/* - * Did it hit the DOS screen memory VA from vm86 mode? - */ -static inline void -check_v8086_mode(struct pt_regs *regs, unsigned long address, - struct task_struct *tsk) -{ -#ifdef CONFIG_VM86 - unsigned long bit; - - if (!v8086_mode(regs) || !tsk->thread.vm86) - return; - - bit = (address - 0xA0000) >> PAGE_SHIFT; - if (bit < 32) - tsk->thread.vm86->screen_bitmap |= 1 << bit; -#endif -} - static bool low_pfn(unsigned long pfn) { return pfn < max_low_pfn; @@ -355,15 +336,6 @@ KERN_ERR "******* Disabling USB legacy in the BIOS may also help.\n"; #endif -/* - * No vm86 mode in 64-bit mode: - */ -static inline void -check_v8086_mode(struct pt_regs *regs, unsigned long address, - struct task_struct *tsk) -{ -} - static int bad_address(void *p) { unsigned long dummy; @@ -1465,8 +1437,6 @@ good_area: else BUG(); } - - check_v8086_mode(regs, address, tsk); } NOKPROBE_SYMBOL(do_user_addr_fault); |