diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /arch/x86/mm/fault.c | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
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 | ||