projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'riscv-for-linus-6.5-mw2' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/kernel/linux-rpi.git]
/
arch
/
riscv
/
mm
/
init.c
diff --git
a/arch/riscv/mm/init.c
b/arch/riscv/mm/init.c
index
4b95d89
..
70fb319
100644
(file)
--- a/
arch/riscv/mm/init.c
+++ b/
arch/riscv/mm/init.c
@@
-267,7
+267,6
@@
static void __init setup_bootmem(void)
dma_contiguous_reserve(dma32_phys_limit);
if (IS_ENABLED(CONFIG_64BIT))
hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT);
dma_contiguous_reserve(dma32_phys_limit);
if (IS_ENABLED(CONFIG_64BIT))
hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT);
- memblock_allow_resize();
}
#ifdef CONFIG_MMU
}
#ifdef CONFIG_MMU
@@
-1370,6
+1369,9
@@
void __init paging_init(void)
{
setup_bootmem();
setup_vm_final();
{
setup_bootmem();
setup_vm_final();
+
+ /* Depend on that Linear Mapping is ready */
+ memblock_allow_resize();
}
void __init misc_mem_init(void)
}
void __init misc_mem_init(void)