diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:43 -0500 |
commit | f0646e43acb18f0e00b00085dc88bc3f403e7930 (patch) | |
tree | c47968a44ac541854929f03d22cf2fb76d76cb55 /arch/x86/mm/init_32.c | |
parent | a5a5dc31794c3271c066835ad2c90c58a3805569 (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/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 5080646da771..206e3f6800b9 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -535,11 +535,12 @@ int __init set_kernel_exec(unsigned long vaddr, int enable) | |||
535 | { | 535 | { |
536 | pte_t *pte; | 536 | pte_t *pte; |
537 | int ret = 1; | 537 | int ret = 1; |
538 | int level; | ||
538 | 539 | ||
539 | if (!nx_enabled) | 540 | if (!nx_enabled) |
540 | goto out; | 541 | goto out; |
541 | 542 | ||
542 | pte = lookup_address(vaddr); | 543 | pte = lookup_address(vaddr, &level); |
543 | BUG_ON(!pte); | 544 | BUG_ON(!pte); |
544 | 545 | ||
545 | if (!pte_exec(*pte)) | 546 | if (!pte_exec(*pte)) |