Commit 1d51b4b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k fix from Geert Uytterhoeven:
 "Fix memblock-related crashes"

* tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Fix memblock-related crashes
parents c0f3ece4 bed1369f

arch/m68k/kernel/setup_mm.c

+0 −2
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) 
					be32_to_cpu(m->addr);

				m68k_memory[m68k_num_memory].size =

					be32_to_cpu(m->size);

				memblock_add(m68k_memory[m68k_num_memory].addr,

					     m68k_memory[m68k_num_memory].size);

				m68k_num_memory++;

			} else

				pr_warn("%s: too many memory chunks\n",

arch/m68k/mm/motorola.c

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ void __init paging_init(void) 


	min_addr = m68k_memory[0].addr;

	max_addr = min_addr + m68k_memory[0].size;

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

	for (i = 1; i < m68k_num_memory;) {

		if (m68k_memory[i].addr < min_addr) {

			printk("Ignoring memory chunk at 0x%lx:0x%lx before the first chunk\n",
@@ -238,6 +239,7 @@ void __init paging_init(void) 
				(m68k_num_memory - i) * sizeof(struct m68k_mem_info));

			continue;

		}

		memblock_add(m68k_memory[i].addr, m68k_memory[i].size);

		addr = m68k_memory[i].addr + m68k_memory[i].size;

		if (addr > max_addr)

			max_addr = addr;