diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:10:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:10:03 +0100 |
| commit | 3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8 (patch) | |
| tree | a9dd314ac18992cdc2c50d4de60535a1b76ee351 /arch/x86/mm/fault.c | |
| parent | 194a9749c73d650c0b1dfdee04fb0bdf0a888ba8 (diff) | |
| parent | 7958b2246fadf54b7ff820a2a5a2c5ca1554716f (diff) | |
Merge branch 'x86/pti' into x86/mm, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 321b78060e93..e6af2b464c3d 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1248,10 +1248,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, tsk = current; mm = tsk->mm; - /* - * Detect and handle instructions that would cause a page fault for - * both a tracked kernel page and a userspace page. - */ prefetchw(&mm->mmap_sem); if (unlikely(kmmio_fault(regs, address))) |