Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: consolidate mem_init() for NUMA machines

Both MIPS systems that support numa (loongsoon3 and sgi-ip27) have
identical mem_init() for NUMA case.

Move that into arch/mips/mm/init.c and drop duplicate per-machine
definitions.

Link: https://lkml.kernel.org/r/20250313135003.836600-5-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Betkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Guo Ren (csky) <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russel King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleinxer <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mike Rapoport (Microsoft) and committed by
Andrew Morton
67e7a600 30686816

+7 -16
-7
arch/mips/loongson64/numa.c
··· 164 164 free_area_init(zones_size); 165 165 } 166 166 167 - void __init mem_init(void) 168 - { 169 - high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); 170 - memblock_free_all(); 171 - setup_zero_pages(); /* This comes from node 0 */ 172 - } 173 - 174 167 /* All PCI device belongs to logical Node-0 */ 175 168 int pcibus_to_node(struct pci_bus *bus) 176 169 {
+7
arch/mips/mm/init.c
··· 482 482 0x80000000 - 4, KCORE_TEXT); 483 483 #endif 484 484 } 485 + #else /* CONFIG_NUMA */ 486 + void __init mem_init(void) 487 + { 488 + high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); 489 + memblock_free_all(); 490 + setup_zero_pages(); /* This comes from node 0 */ 491 + } 485 492 #endif /* !CONFIG_NUMA */ 486 493 487 494 void free_init_pages(const char *what, unsigned long begin, unsigned long end)
-9
arch/mips/sgi-ip27/ip27-memory.c
··· 406 406 } 407 407 } 408 408 409 - extern void setup_zero_pages(void); 410 - 411 409 void __init paging_init(void) 412 410 { 413 411 unsigned long zones_size[MAX_NR_ZONES] = {0, }; ··· 413 415 pagetable_init(); 414 416 zones_size[ZONE_NORMAL] = max_low_pfn; 415 417 free_area_init(zones_size); 416 - } 417 - 418 - void __init mem_init(void) 419 - { 420 - high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); 421 - memblock_free_all(); 422 - setup_zero_pages(); /* This comes from node 0 */ 423 418 }