summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-05-29 13:50:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-05-29 13:50:31 -0700
commitef4531be685f238594877a8e28e65544d5a022d7 (patch)
tree9155b639abd6e69f46e36b94853367bd41aea4e2
parentb58f2140ea8605ee6ea0530d9c0cb5d049f9c7ca (diff)
parentbf71bc16e02162388808949b179d59d0b571b965 (diff)
downloadlinux-sh-ef4531be685f238594877a8e28e65544d5a022d7.tar.gz
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()
-rw-r--r--arch/parisc/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 5224fb38d766..01d7071b23f7 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -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