From: Joerg Roedel <jroe...@suse.de>

Define INIT_PGD to point to the correct initial page-table
for 32 and 64 bit and use it where needed. This fixes the
build on 32 bit with CONFIG_PAGE_TABLE_ISOLATION enabled.

Signed-off-by: Joerg Roedel <jroe...@suse.de>
---
 arch/x86/mm/dump_pagetables.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 62a7e9f..84498da 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -110,6 +110,8 @@ static struct addr_marker address_markers[] = {
        [END_OF_SPACE_NR]       = { -1,                 NULL }
 };
 
+#define INIT_PGD       ((pgd_t *) &init_top_pgt)
+
 #else /* CONFIG_X86_64 */
 
 enum address_markers_idx {
@@ -138,6 +140,8 @@ static struct addr_marker address_markers[] = {
        [END_OF_SPACE_NR]       = { -1,                 NULL }
 };
 
+#define INIT_PGD       (swapper_pg_dir)
+
 #endif /* !CONFIG_X86_64 */
 
 /* Multipliers for offsets within the PTEs */
@@ -495,11 +499,7 @@ static inline bool is_hypervisor_range(int idx)
 static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
                                       bool checkwx, bool dmesg)
 {
-#ifdef CONFIG_X86_64
-       pgd_t *start = (pgd_t *) &init_top_pgt;
-#else
-       pgd_t *start = swapper_pg_dir;
-#endif
+       pgd_t *start = INIT_PGD;
        pgprotval_t prot, eff;
        int i;
        struct pg_state st = {};
@@ -565,7 +565,7 @@ EXPORT_SYMBOL_GPL(ptdump_walk_pgd_level_debugfs);
 static void ptdump_walk_user_pgd_level_checkwx(void)
 {
 #ifdef CONFIG_PAGE_TABLE_ISOLATION
-       pgd_t *pgd = (pgd_t *) &init_top_pgt;
+       pgd_t *pgd = INIT_PGD;
 
        if (!static_cpu_has(X86_FEATURE_PTI))
                return;
-- 
2.7.4

Reply via email to