diff options
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fdc667422df9..ec08d8389850 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -91,12 +91,10 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr, | |||
| 91 | int prefetch = 0; | 91 | int prefetch = 0; |
| 92 | unsigned char *max_instr; | 92 | unsigned char *max_instr; |
| 93 | 93 | ||
| 94 | #ifdef CONFIG_X86_32 | 94 | /* |
| 95 | if (!(__supported_pte_mask & _PAGE_NX)) | 95 | * If it was a exec (instruction fetch) fault on NX page, then |
| 96 | return 0; | 96 | * do not ignore the fault: |
| 97 | #endif | 97 | */ |
| 98 | |||
| 99 | /* If it was a exec fault on NX page, ignore */ | ||
| 100 | if (error_code & PF_INSTR) | 98 | if (error_code & PF_INSTR) |
| 101 | return 0; | 99 | return 0; |
| 102 | 100 | ||
