aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/fault_32.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:33:43 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:43 -0500
commitf0646e43acb18f0e00b00085dc88bc3f403e7930 (patch)
treec47968a44ac541854929f03d22cf2fb76d76cb55 /arch/x86/mm/fault_32.c
parenta5a5dc31794c3271c066835ad2c90c58a3805569 (diff)
x86: return the page table level in lookup_address()
based on this patch from Andi Kleen: | Subject: CPA: Return the page table level in lookup_address() | From: Andi Kleen <ak@suse.de> | | Needed for the next change. | | And change all the callers. and ported it to x86.git. Signed-off-by: Andi Kleen <ak@suse.de> Acked-by: Jan Beulich <jbeulich@novell.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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index f7972ae7da07..f4f8c324715f 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -613,7 +613,8 @@ no_context:
613 613
614#ifdef CONFIG_X86_PAE 614#ifdef CONFIG_X86_PAE
615 if (error_code & PF_INSTR) { 615 if (error_code & PF_INSTR) {
616 pte_t *pte = lookup_address(address); 616 int level;
617 pte_t *pte = lookup_address(address, &level);
617 618
618 if (pte && pte_present(*pte) && !pte_exec(*pte)) 619 if (pte && pte_present(*pte) && !pte_exec(*pte))
619 printk(KERN_CRIT "kernel tried to execute " 620 printk(KERN_CRIT "kernel tried to execute "