From: Kyle Hendry Date: Sun, 21 Jun 2026 18:47:02 +0000 (-0700) Subject: MIPS: mm: Add check for highmem before removing memory block X-Git-Tag: v7.2-rc2~8^2~2 X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=6d5fbecd0213489bc4de71a0da194d18e654fd6e;p=thirdparty%2Flinux.git MIPS: mm: Add check for highmem before removing memory block If a device has less physical memory than the highmem threshold bootmem_init() doesn't set highstart_pfn. This results in highmem_init() wrongly disabling the entire memory range if the cpu doesn't support highmem. Add a check that highstart_pfn is non zero before removing the highmem block. Fixes: f171b55f1441 ("mips: fix HIGHMEM initialization") Signed-off-by: Kyle Hendry Signed-off-by: Thomas Bogendoerfer --- diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 1c07ca84ee214..352718e43f697 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -426,10 +426,11 @@ static inline void __init highmem_init(void) unsigned long tmp; /* - * If CPU cannot support HIGHMEM discard the memory above highstart_pfn + * If CPU cannot support HIGHMEM discard any memory above highstart_pfn */ if (cpu_has_dc_aliases) { - memblock_remove(PFN_PHYS(highstart_pfn), -1); + if (highstart_pfn) + memblock_remove(PFN_PHYS(highstart_pfn), -1); return; }