Merge tag 'm68knommu-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (cdd3bb54) · Commits · 戴 / test

Pull m68knommu mm fixes from Greg Ungerer: "Two critical mm related fixes that affect booting of m68k/ColdFire devices. Both fix problems caused by recent system init memblock changes" * tag 'm68knommu-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: mm: fix node memblock init m68k: nommu: register start of the memory with memblock

arch/m68k/kernel/setup_no.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,8 @@ void __init setup_arch(char **cmdline_p)
		pr_debug("MEMORY -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx\n ",
		__bss_stop, memory_start, memory_start, memory_end);

		memblock_add(memory_start, memory_end - memory_start);
		memblock_add(_rambase, memory_end - _rambase);
		memblock_reserve(_rambase, memory_start - _rambase);

		/* Keep a copy of command line */
		*cmdline_p = &command_line[0];

arch/m68k/mm/mcfmmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ void __init cf_bootmem_alloc(void)
		m68k_memory[0].addr = _rambase;
		m68k_memory[0].size = _ramend - _rambase;

		memblock_add(m68k_memory[0].addr, m68k_memory[0].size);
		memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0);

		/* compute total pages in system */
		num_pages = PFN_DOWN(_ramend - _rambase);

Admin message