diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-04 19:16:11 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-04 19:16:11 +0300 |
commit | d2467adb66108f1b7fec8cadbdb8ca140e88effe (patch) | |
tree | 7baa151185988bef922863f2dcb7ffcff6e10287 | |
parent | cec4de302c5ff2c5eb3bfcb0c4845a095f5149b9 (diff) | |
parent | ef1f2258748b675422ca0107e5bfb9ceeac675de (diff) | |
download | linux-d2467adb66108f1b7fec8cadbdb8ca140e88effe.tar.xz |
Merge tag 'riscv-for-linus-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
Palmer writes:
"A Single RISC-V Fix for 4.19-rc7
This tag contains a single patch that managed to get lost in the
shuffle, which explains why it's so late. This single line has been
floating around in various patch sets for months, and fixes our DMA32
region."
* tag 'riscv-for-linus-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
RISCV: Fix end PFN for low memory
-rw-r--r-- | arch/riscv/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index aee603123030..b2d26d9d8489 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -186,7 +186,7 @@ static void __init setup_bootmem(void) BUG_ON(mem_size == 0); set_max_mapnr(PFN_DOWN(mem_size)); - max_low_pfn = pfn_base + PFN_DOWN(mem_size); + max_low_pfn = memblock_end_of_DRAM(); #ifdef CONFIG_BLK_DEV_INITRD setup_initrd(); |