Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8f8cca4 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64: ptdump: use static initializers for vmemmap region boundaries 



There is no need to initialize the vmemmap region boundaries dynamically,
since they are compile time constants. So just add these constants to the
global struct initializer, and drop the dynamic assignment and related code.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 1dff8083

arch/arm64/mm/dump.c

+13 −36
Original line number Diff line number Diff line
@@ -32,23 +32,7 @@ struct addr_marker { 
	const char *name;

};



enum address_markers_idx {

	MODULES_START_NR = 0,

	MODULES_END_NR,

	VMALLOC_START_NR,

	VMALLOC_END_NR,

	FIXADDR_START_NR,

	FIXADDR_END_NR,

	PCI_START_NR,

	PCI_END_NR,

#ifdef CONFIG_SPARSEMEM_VMEMMAP

	VMEMMAP_START_NR,

	VMEMMAP_END_NR,

#endif

	KERNEL_SPACE_NR,

};



static struct addr_marker address_markers[] = {

static const struct addr_marker address_markers[] = {

	{ MODULES_VADDR,		"Modules start" },

	{ MODULES_END,			"Modules end" },

	{ VMALLOC_START,		"vmalloc() Area" },
@@ -58,8 +42,8 @@ static struct addr_marker address_markers[] = { 
	{ PCI_IO_START,			"PCI I/O start" },

	{ PCI_IO_END,			"PCI I/O end" },

#ifdef CONFIG_SPARSEMEM_VMEMMAP

	{ 0,			"vmemmap start" },

	{ 0,			"vmemmap end" },

	{ VMEMMAP_START,		"vmemmap start" },

	{ VMEMMAP_START + VMEMMAP_SIZE,	"vmemmap end" },

#endif

	{ PAGE_OFFSET,			"Linear Mapping" },

	{ -1,				NULL },
@@ -347,13 +331,6 @@ static int ptdump_init(void) 
			for (j = 0; j < pg_level[i].num; j++)

				pg_level[i].mask |= pg_level[i].bits[j].mask;



#ifdef CONFIG_SPARSEMEM_VMEMMAP

	address_markers[VMEMMAP_START_NR].start_address =

				(unsigned long)virt_to_page(PAGE_OFFSET);

	address_markers[VMEMMAP_END_NR].start_address =

				(unsigned long)virt_to_page(high_memory);

#endif



	pe = debugfs_create_file("kernel_page_tables", 0400, NULL, NULL,

				 &ptdump_fops);

	return pe ? 0 : -ENOMEM;