Skip to content

Commit 4964579

Browse files
rppttorvalds
authored andcommitted
mircoblaze: drop unneeded NUMA and sparsemem initializations
microblaze does not support neither NUMA not SPARSMEM, so there is no point to call memblock_set_node() and sparse_memory_present_with_active_regions() functions during microblaze memory initialization. Remove these calls and the surrounding code. Signed-off-by: Mike Rapoport <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Baoquan He <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Daniel Axtens <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Emil Renner Berthing <[email protected]> Cc: Hari Bathini <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jonathan Cameron <[email protected]> Cc: Marek Szyprowski <[email protected]> Cc: Max Filippov <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Michal Simek <[email protected]> Cc: Miguel Ojeda <[email protected]> Cc: Palmer Dabbelt <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Russell King <[email protected]> Cc: Stafford Horne <[email protected]> Cc: Thomas Bogendoerfer <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Will Deacon <[email protected]> Cc: Yoshinori Sato <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent c8e4701 commit 4964579

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

arch/microblaze/mm/init.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,8 @@ static void __init paging_init(void)
108108

109109
void __init setup_memory(void)
110110
{
111-
struct memblock_region *reg;
112-
113111
#ifndef CONFIG_MMU
112+
struct memblock_region *reg;
114113
u32 kernel_align_start, kernel_align_size;
115114

116115
/* Find main memory where is the kernel */
@@ -164,17 +163,6 @@ void __init setup_memory(void)
164163
pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);
165164
pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn);
166165

167-
/* Add active regions with valid PFNs */
168-
for_each_memblock(memory, reg) {
169-
unsigned long start_pfn, end_pfn;
170-
171-
start_pfn = memblock_region_memory_base_pfn(reg);
172-
end_pfn = memblock_region_memory_end_pfn(reg);
173-
memblock_set_node(start_pfn << PAGE_SHIFT,
174-
(end_pfn - start_pfn) << PAGE_SHIFT,
175-
&memblock.memory, 0);
176-
}
177-
178166
paging_init();
179167
}
180168

0 commit comments

Comments
 (0)