arm64: hibernate: variable pudp is used instead of pd4dp
authorPavel Tatashin <pasha.tatashin@soleen.com>
Mon, 25 Jan 2021 19:19:07 +0000 (14:19 -0500)
committerWill Deacon <will@kernel.org>
Wed, 27 Jan 2021 15:41:11 +0000 (15:41 +0000)
There should be p4dp used when p4d page is allocated.
This is not a functional issue, but for the logical correctness this
should be fixed.

Fixes: e9f6376858b9 ("arm64: add support for folded p4d page tables")
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Link: https://lore.kernel.org/r/20210125191923.1060122-3-pasha.tatashin@soleen.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/hibernate.c

index 9c9f47e..0a54d81 100644 (file)
@@ -190,10 +190,10 @@ static int trans_pgd_map_page(pgd_t *trans_pgd, void *page,
 
        pgdp = pgd_offset_pgd(trans_pgd, dst_addr);
        if (pgd_none(READ_ONCE(*pgdp))) {
-               pudp = (void *)get_safe_page(GFP_ATOMIC);
-               if (!pudp)
+               p4dp = (void *)get_safe_page(GFP_ATOMIC);
+               if (!pgdp)
                        return -ENOMEM;
-               pgd_populate(&init_mm, pgdp, pudp);
+               pgd_populate(&init_mm, pgdp, p4dp);
        }
 
        p4dp = p4d_offset(pgdp, dst_addr);