diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 13:50:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 13:50:31 -0700 |
| commit | ef4531be685f238594877a8e28e65544d5a022d7 (patch) | |
| tree | 9155b639abd6e69f46e36b94853367bd41aea4e2 | |
| parent | Merge tag 'iommu-fixes-v5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| parent | parisc: Fix kernel panic in mem_init() (diff) | |
| download | wireguard-linux-ef4531be685f238594877a8e28e65544d5a022d7.tar.xz wireguard-linux-ef4531be685f238594877a8e28e65544d5a022d7.zip | |
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()
Diffstat (limited to '')
| -rw-r--r-- | arch/parisc/mm/init.c | 2 |
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 |