aboutsummaryrefslogtreecommitdiffstats
path: root/arch/riscv/mm/init.c
diff options
context:
space:
mode:
authorAlexandre Ghiti <alex@ghiti.fr>2020-02-17 00:28:47 -0500
committerPalmer Dabbelt <palmerdabbelt@google.com>2020-03-04 15:11:03 -0800
commita160eed4b783d7b250a32f7e5787c9867abc5686 (patch)
tree59183deec4b7f02bba486729c23596f4128dc29d /arch/riscv/mm/init.c
parentriscv: Force flat memory model with no-mmu (diff)
downloadlinux-dev-a160eed4b783d7b250a32f7e5787c9867abc5686.tar.xz
linux-dev-a160eed4b783d7b250a32f7e5787c9867abc5686.zip
riscv: Fix range looking for kernel image memblock
When looking for the memblock where the kernel lives, we should check that the memory range associated to the memblock entirely comprises the kernel image and not only intersects with it. Signed-off-by: Alexandre Ghiti <alex@ghiti.fr> Reviewed-by: Anup Patel <anup@brainfault.org> Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Diffstat (limited to '')
-rw-r--r--arch/riscv/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 965a8cf4829c..fab855963c73 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -131,7 +131,7 @@ void __init setup_bootmem(void)
for_each_memblock(memory, reg) {
phys_addr_t end = reg->base + reg->size;
- if (reg->base <= vmlinux_end && vmlinux_end <= end) {
+ if (reg->base <= vmlinux_start && vmlinux_end <= end) {
mem_size = min(reg->size, (phys_addr_t)-PAGE_OFFSET);
/*