diff options
| author |   Thomas Bogendoerfer <tbogendoerfer@suse.de> | 2019-02-27 10:42:56 +0100 |
|---|---|---|
| committer |   Paul Burton <paul.burton@mips.com> | 2019-02-27 18:49:29 -0800 |
| commit | e0bf304e4a00d66d90904a6c5b93141f177cf6d2 (patch) | |
| tree | ad4311bb161fcb8976279002a4b807eb9bb4fd9c /arch | |
| parent | MIPS: BCM63XX: provide DMA masks for ethernet devices (diff) | |
| download | linux-dev-e0bf304e4a00d66d90904a6c5b93141f177cf6d2.tar.xz linux-dev-e0bf304e4a00d66d90904a6c5b93141f177cf6d2.zip | |
MIPS: fix memory setup for platforms with PHYS_OFFSET != 0
For platforms, which use a PHYS_OFFSET != 0, symbol _end also
contains that offset. So when calling memblock_reserve() for
reserving kernel the size argument needs to be adjusted.
Fixes: bcec54bf3118 ("mips: switch to NO_BOOTMEM")
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org # v4.20+
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8c6c48ed786a..d2e5a5ad0e6f 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -384,7 +384,8 @@ static void __init bootmem_init(void) init_initrd(); reserved_end = (unsigned long) PFN_UP(__pa_symbol(&_end)); - memblock_reserve(PHYS_OFFSET, reserved_end << PAGE_SHIFT); + memblock_reserve(PHYS_OFFSET, + (reserved_end << PAGE_SHIFT) - PHYS_OFFSET); /* * max_low_pfn is not a number of pages. The number of pages |