Commit 631267f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull m68knommu fix from Greg Ungerer:
 "A single change to fix booting on ColdFire platforms that have RAM
  starting at a non-0 address"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: fix early memory reservation for ColdFire MMU systems
parents 2601dd39 c90bbce9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void __init cf_bootmem_alloc(void)
	high_memory = (void *)_ramend;

	/* Reserve kernel text/data/bss */
	memblock_reserve(memstart, memstart - _rambase);
	memblock_reserve(_rambase, memstart - _rambase);

	m68k_virt_to_node_shift = fls(_ramend - 1) - 6;
	module_fixup(NULL, __start_fixup, __stop_fixup);