diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-06 19:35:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-06 19:35:30 -0700 |
| commit | 631267f6adcc8d760d145dbd33d83d133d2733d7 (patch) | |
| tree | 9495eb728659a9f757ab978a9a003dc68bc10754 | |
| parent | 2601dd392dd1cabd11935448c0afe3293feb27a3 (diff) | |
| parent | c90bbce9eedd14f9428388d9442b5b3e98a2a6dd (diff) | |
| download | linux-631267f6adcc8d760d145dbd33d83d133d2733d7.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
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
| -rw-r--r-- | arch/m68k/mm/mcfmmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c index 70dde040779b..f5453d944ff5 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c @@ -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); |