Skip to content

Commit 02eac06

Browse files
jgross1Ingo Molnar
authored andcommitted
x86/pat: Restructure _lookup_address_cpa()
Modify _lookup_address_cpa() to no longer use lookup_address(), but only lookup_address_in_pgd(). This is done in preparation of using lookup_address_in_pgd_attr(). No functional change intended. Signed-off-by: Juergen Gross <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent d29dc51 commit 02eac06

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

arch/x86/mm/pat/set_memory.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -744,11 +744,14 @@ EXPORT_SYMBOL_GPL(lookup_address);
744744
static pte_t *_lookup_address_cpa(struct cpa_data *cpa, unsigned long address,
745745
unsigned int *level)
746746
{
747-
if (cpa->pgd)
748-
return lookup_address_in_pgd(cpa->pgd + pgd_index(address),
749-
address, level);
747+
pgd_t *pgd;
748+
749+
if (!cpa->pgd)
750+
pgd = pgd_offset_k(address);
751+
else
752+
pgd = cpa->pgd + pgd_index(address);
750753

751-
return lookup_address(address, level);
754+
return lookup_address_in_pgd(pgd, address, level);
752755
}
753756

754757
/*

0 commit comments

Comments
 (0)