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 <jgross@suse.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240412151258.9171-4-jgross@suse.com

diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index bfa0aae45d48c8095ba1e31940288bf9551c91d2..4ebccaf29bf2a642a48302685b84b6bd52bde638 100644 (file)
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -744,11 +744,14 @@ EXPORT_SYMBOL_GPL(lookup_address);
 static pte_t *_lookup_address_cpa(struct cpa_data *cpa, unsigned long address,
                                  unsigned int *level)
 {
-       if (cpa->pgd)
-               return lookup_address_in_pgd(cpa->pgd + pgd_index(address),
-                                              address, level);
+       pgd_t *pgd;
+
+       if (!cpa->pgd)
+               pgd = pgd_offset_k(address);
+       else
+               pgd = cpa->pgd + pgd_index(address);
 
-       return lookup_address(address, level);
+       return lookup_address_in_pgd(pgd, address, level);
 }
 
 /*