Commit ef4531be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents b58f2140 bf71bc16

arch/parisc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ void __init mem_init(void) 
			> BITS_PER_LONG);



	high_memory = __va((max_pfn << PAGE_SHIFT));

	set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1);

	set_max_mapnr(max_low_pfn);

	memblock_free_all();



#ifdef CONFIG_PA11