diff options
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/fault_32.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/init_32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index 41c31968a74c..f7972ae7da07 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c | |||
@@ -615,7 +615,7 @@ no_context: | |||
615 | if (error_code & PF_INSTR) { | 615 | if (error_code & PF_INSTR) { |
616 | pte_t *pte = lookup_address(address); | 616 | pte_t *pte = lookup_address(address); |
617 | 617 | ||
618 | if (pte && pte_present(*pte) && !pte_exec_kernel(*pte)) | 618 | if (pte && pte_present(*pte) && !pte_exec(*pte)) |
619 | printk(KERN_CRIT "kernel tried to execute " | 619 | printk(KERN_CRIT "kernel tried to execute " |
620 | "NX-protected page - exploit attempt? " | 620 | "NX-protected page - exploit attempt? " |
621 | "(uid: %d)\n", current->uid); | 621 | "(uid: %d)\n", current->uid); |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 724a5eff6f34..5080646da771 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -542,7 +542,7 @@ int __init set_kernel_exec(unsigned long vaddr, int enable) | |||
542 | pte = lookup_address(vaddr); | 542 | pte = lookup_address(vaddr); |
543 | BUG_ON(!pte); | 543 | BUG_ON(!pte); |
544 | 544 | ||
545 | if (!pte_exec_kernel(*pte)) | 545 | if (!pte_exec(*pte)) |
546 | ret = 0; | 546 | ret = 0; |
547 | 547 | ||
548 | if (enable) | 548 | if (enable) |