diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /arch/x86/mm/fault.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
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 | ||