diff options
| author | Andi Kleen <ak@suse.de> | 2008-01-30 13:33:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:42 +0100 |
| commit | 4c3c4b4513a361cc6ac5ee8677695260c4f0f25f (patch) | |
| tree | 3a56ada5131a85fff2bb37841d822d098b92f68c /arch/x86/mm/fault_32.c | |
| parent | e66a95127dc4273d3573eb03657991f7bbd5dca3 (diff) | |
x86: clean up pte_exec
- Rename it to pte_exec() from pte_exec_kernel(). There is nothing
kernel specific in there.
- Move it into the common file because _PAGE_NX is 0 on !PAE and then
pte_exec() will be always evaluate to true.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/fault_32.c')
| -rw-r--r-- | arch/x86/mm/fault_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index 41c31968a74..f7972ae7da0 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c @@ -615,7 +615,7 @@ no_context: if (error_code & PF_INSTR) { pte_t *pte = lookup_address(address); - if (pte && pte_present(*pte) && !pte_exec_kernel(*pte)) + if (pte && pte_present(*pte) && !pte_exec(*pte)) printk(KERN_CRIT "kernel tried to execute " "NX-protected page - exploit attempt? " "(uid: %d)\n", current->uid); |