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

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 1d51b4b1 c0f3ece4

+2 -2
-2
arch/m68k/kernel/setup_mm.c
··· 164 164 be32_to_cpu(m->addr); 165 165 m68k_memory[m68k_num_memory].size = 166 166 be32_to_cpu(m->size); 167 - memblock_add(m68k_memory[m68k_num_memory].addr, 168 - m68k_memory[m68k_num_memory].size); 169 167 m68k_num_memory++; 170 168 } else 171 169 pr_warn("%s: too many memory chunks\n",
+2
arch/m68k/mm/motorola.c
··· 228 228 229 229 min_addr = m68k_memory[0].addr; 230 230 max_addr = min_addr + m68k_memory[0].size; 231 + memblock_add(m68k_memory[0].addr, m68k_memory[0].size); 231 232 for (i = 1; i < m68k_num_memory;) { 232 233 if (m68k_memory[i].addr < min_addr) { 233 234 printk("Ignoring memory chunk at 0x%lx:0x%lx before the first chunk\n", ··· 239 238 (m68k_num_memory - i) * sizeof(struct m68k_mem_info)); 240 239 continue; 241 240 } 241 + memblock_add(m68k_memory[i].addr, m68k_memory[i].size); 242 242 addr = m68k_memory[i].addr + m68k_memory[i].size; 243 243 if (addr > max_addr) 244 244 max_addr = addr;