diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 15:33:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 15:33:43 +0300 |
| commit | f0646e43acb18f0e00b00085dc88bc3f403e7930 (patch) | |
| tree | c47968a44ac541854929f03d22cf2fb76d76cb55 /arch/x86/mm/init_32.c | |
| parent | a5a5dc31794c3271c066835ad2c90c58a3805569 (diff) | |
| download | linux-f0646e43acb18f0e00b00085dc88bc3f403e7930.tar.xz | |
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) { pte_t *pte; int ret = 1; + int level; if (!nx_enabled) goto out; - pte = lookup_address(vaddr); + pte = lookup_address(vaddr, &level); BUG_ON(!pte); if (!pte_exec(*pte)) |