| From b50846ea6d93aff23a16bbcaa07d0d2a7fdef670 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Thu, 28 May 2020 10:54:37 -0400 |
| Subject: [PATCH] Revert "riscv: Fix range looking for kernel image memblock" |
| |
| This reverts commit 337add03da898ddf0396bc93c3d09c45557fda32 which is |
| mainline a160eed4b783d7b250a32f7e5787c9867abc5686. |
| |
| It requires v5.3-rc1~36^2~7 or newer for the vmlinux_start variable to |
| be present. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c |
| index 0569138b4a4c..84747d7a1e85 100644 |
| --- a/arch/riscv/mm/init.c |
| +++ b/arch/riscv/mm/init.c |
| @@ -101,7 +101,7 @@ void __init setup_bootmem(void) |
| phys_addr_t vmlinux_end = __pa(_end); |
| phys_addr_t end = reg->base + reg->size; |
| |
| - if (reg->base <= vmlinux_start && vmlinux_end <= end) { |
| + if (reg->base <= vmlinux_end && vmlinux_end <= end) { |
| /* |
| * Reserve from the start of the region to the end of |
| * the kernel |
| -- |
| 2.7.4 |
| |