diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-04 06:05:28 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-04 06:05:28 -1000 |
| commit | 410430b616a739eb395143f4f608d4339a3b0a8f (patch) | |
| tree | d8adae9cb020ed909ff2402ecd27bfa9df59023d /arch/mips/mm/init.c | |
| parent | 1e9cdc2ea15adf4a821eefedabf6c0c8cf0b6a55 (diff) | |
| parent | 0880884b36d1230a80a0322abc9b9c7b26942b65 (diff) | |
| download | linux-410430b616a739eb395143f4f608d4339a3b0a8f.tar.gz linux-410430b616a739eb395143f4f608d4339a3b0a8f.zip | |
Merge tag 'mips-fixes_7.2_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer.
* tag 'mips-fixes_7.2_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: configs: Enable the current Ingenic USB PHY symbol
MIPS: loongson64: add IRQ work based on self-IPI
MIPS: mm: Add check for highmem before removing memory block
mips: Add build salt to the vDSO
MIPS: DEC: Ensure RTC platform device deregistration upon failure
Diffstat (limited to 'arch/mips/mm/init.c')
| -rw-r--r-- | arch/mips/mm/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 1c07ca84ee21..352718e43f69 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; } |