diff options
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r-- | arch/x86/mm/fault.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 3109ba6c6ede..78ca9a8ee454 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <asm/cpufeature.h> /* boot_cpu_has, ... */ | 20 | #include <asm/cpufeature.h> /* boot_cpu_has, ... */ |
21 | #include <asm/traps.h> /* dotraplinkage, ... */ | 21 | #include <asm/traps.h> /* dotraplinkage, ... */ |
22 | #include <asm/pgalloc.h> /* pgd_*(), ... */ | 22 | #include <asm/pgalloc.h> /* pgd_*(), ... */ |
23 | #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ | ||
24 | #include <asm/fixmap.h> /* VSYSCALL_ADDR */ | 23 | #include <asm/fixmap.h> /* VSYSCALL_ADDR */ |
25 | #include <asm/vsyscall.h> /* emulate_vsyscall */ | 24 | #include <asm/vsyscall.h> /* emulate_vsyscall */ |
26 | #include <asm/vm86.h> /* struct vm86 */ | 25 | #include <asm/vm86.h> /* struct vm86 */ |
@@ -1256,8 +1255,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
1256 | * Detect and handle instructions that would cause a page fault for | 1255 | * Detect and handle instructions that would cause a page fault for |
1257 | * both a tracked kernel page and a userspace page. | 1256 | * both a tracked kernel page and a userspace page. |
1258 | */ | 1257 | */ |
1259 | if (kmemcheck_active(regs)) | ||
1260 | kmemcheck_hide(regs); | ||
1261 | prefetchw(&mm->mmap_sem); | 1258 | prefetchw(&mm->mmap_sem); |
1262 | 1259 | ||
1263 | if (unlikely(kmmio_fault(regs, address))) | 1260 | if (unlikely(kmmio_fault(regs, address))) |
@@ -1280,9 +1277,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
1280 | if (!(error_code & (X86_PF_RSVD | X86_PF_USER | X86_PF_PROT))) { | 1277 | if (!(error_code & (X86_PF_RSVD | X86_PF_USER | X86_PF_PROT))) { |
1281 | if (vmalloc_fault(address) >= 0) | 1278 | if (vmalloc_fault(address) >= 0) |
1282 | return; | 1279 | return; |
1283 | |||
1284 | if (kmemcheck_fault(regs, address, error_code)) | ||
1285 | return; | ||
1286 | } | 1280 | } |
1287 | 1281 | ||
1288 | /* Can handle a stale RO->RW TLB: */ | 1282 | /* Can handle a stale RO->RW TLB: */ |