Skip to content

Commit ef4531b

Browse files
committed
Merge branch 'parisc-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller: "Fix a kernel panic at boot time for some HP-PARISC machines" * 'parisc-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix kernel panic in mem_init()
2 parents b58f214 + bf71bc1 commit ef4531b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/parisc/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void __init mem_init(void)
562562
> BITS_PER_LONG);
563563

564564
high_memory = __va((max_pfn << PAGE_SHIFT));
565-
set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1);
565+
set_max_mapnr(max_low_pfn);
566566
memblock_free_all();
567567

568568
#ifdef CONFIG_PA11

0 commit comments

Comments
 (0)