Skip to content

Commit e455248

Browse files
Steven Pricetorvalds
authored andcommitted
x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct
To enable x86 to use the generic walk_page_range() function, the callers of ptdump_walk_pgd_level() need to pass an mm_struct rather than the raw pgd_t pointer. Luckily since commit 7e904a9 ("efi: Use efi_mm in x86 as well as ARM") we now have an mm_struct for EFI on x86. Link: http://lkml.kernel.org/r/20191218162402.45610-18-steven.price@arm.com Signed-off-by: Steven Price <steven.price@arm.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Alexandre Ghiti <alex@ghiti.fr> Cc: Andy Lutomirski <luto@kernel.org> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David S. Miller <davem@davemloft.net> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Hogan <jhogan@kernel.org> Cc: James Morse <james.morse@arm.com> Cc: Jerome Glisse <jglisse@redhat.com> Cc: "Liang, Kan" <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Paul Burton <paul.burton@mips.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Will Deacon <will@kernel.org> Cc: Zong Li <zong.li@sifive.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 74d2aaa commit e455248

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

arch/x86/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
extern pgd_t early_top_pgt[PTRS_PER_PGD];
3030
int __init __early_make_pgtable(unsigned long address, pmdval_t pmd);
3131

32-
void ptdump_walk_pgd_level(struct seq_file *m, pgd_t *pgd);
32+
void ptdump_walk_pgd_level(struct seq_file *m, struct mm_struct *mm);
3333
void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user);
3434
void ptdump_walk_pgd_level_checkwx(void);
3535
void ptdump_walk_user_pgd_level_checkwx(void);

arch/x86/mm/dump_pagetables.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,9 +567,9 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
567567
pr_info("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n");
568568
}
569569

570-
void ptdump_walk_pgd_level(struct seq_file *m, pgd_t *pgd)
570+
void ptdump_walk_pgd_level(struct seq_file *m, struct mm_struct *mm)
571571
{
572-
ptdump_walk_pgd_level_core(m, pgd, false, true);
572+
ptdump_walk_pgd_level_core(m, mm->pgd, false, true);
573573
}
574574

575575
void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user)

arch/x86/platform/efi/efi_32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void efi_sync_low_kernel_mappings(void) {}
4949
void __init efi_dump_pagetable(void)
5050
{
5151
#ifdef CONFIG_EFI_PGT_DUMP
52-
ptdump_walk_pgd_level(NULL, swapper_pg_dir);
52+
ptdump_walk_pgd_level(NULL, &init_mm);
5353
#endif
5454
}
5555

arch/x86/platform/efi/efi_64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,9 @@ void __init efi_dump_pagetable(void)
471471
{
472472
#ifdef CONFIG_EFI_PGT_DUMP
473473
if (efi_have_uv1_memmap())
474-
ptdump_walk_pgd_level(NULL, swapper_pg_dir);
474+
ptdump_walk_pgd_level(NULL, &init_mm);
475475
else
476-
ptdump_walk_pgd_level(NULL, efi_mm.pgd);
476+
ptdump_walk_pgd_level(NULL, &efi_mm);
477477
#endif
478478
}
479479

0 commit comments

Comments
 (0)