Commit bbb09f5c authored by Ingo Molnar's avatar Ingo Molnar

x86: prepare for the unification of the cpa code

prepare for the unification of the cpa code, by unifying the
lookup_address() logic between 32-bit and 64-bit.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 55ce29ba
......@@ -20,10 +20,10 @@ enum {
LOWEST_LEVEL = 4,
LPS = (1 << PMD_SHIFT),
#elif defined(CONFIG_X86_PAE)
LOWEST_LEVEL = 3,
LOWEST_LEVEL = 4,
LPS = (1 << PMD_SHIFT),
#else
LOWEST_LEVEL = 3, /* lookup_address lies here */
LOWEST_LEVEL = 4, /* lookup_address lies here */
LPS = (1 << 22),
#endif
GPS = (1<<30)
......
......@@ -29,10 +29,10 @@ pte_t *lookup_address(unsigned long address, int *level)
pmd = pmd_offset(pud, address);
if (pmd_none(*pmd))
return NULL;
*level = 2;
*level = 3;
if (pmd_large(*pmd))
return (pte_t *)pmd;
*level = 3;
*level = 4;
return pte_offset_kernel(pmd, address);
}
......@@ -136,7 +136,7 @@ repeat:
address < (unsigned long)&_etext &&
(pgprot_val(prot) & _PAGE_NX));
if (level == 3) {
if (level == 4) {
set_pte_atomic(kpte, mk_pte(page, canon_pgprot(prot)));
} else {
err = split_large_page(kpte, address);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment