diff options
| author | Alexander Gordeev <agordeev@linux.ibm.com> | 2021-01-21 13:06:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-12 16:34:56 +0200 |
| commit | 06de5cf61538eca18aa2baccf65fa175e07c58d9 (patch) | |
| tree | a9b94e37e05dd59d703cd9872744ff0972e30fab /arch/s390 | |
| parent | 6ed826c949cf3cb38aba063a55be260d52c0ce55 (diff) | |
| download | linux-stable-06de5cf61538eca18aa2baccf65fa175e07c58d9.tar.gz linux-stable-06de5cf61538eca18aa2baccf65fa175e07c58d9.tar.bz2 linux-stable-06de5cf61538eca18aa2baccf65fa175e07c58d9.zip | |
s390/setup: use physical pointers for memblock_reserve()
[ Upstream commit 04f11ed7d8e018e1f01ebda5814ddfeb3a1e6ae1 ]
memblock_reserve() function accepts physcal address of a memory
block to be reserved, but provided with virtual memory pointers.
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index e38de9e8ee13..2ebde341d057 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -797,13 +797,10 @@ static void __init check_initrd(void) */ static void __init reserve_kernel(void) { - unsigned long start_pfn = PFN_UP(__pa(_end)); - memblock_reserve(0, STARTUP_NORMAL_OFFSET); - memblock_reserve((unsigned long)sclp_early_sccb, EXT_SCCB_READ_SCP); memblock_reserve(__amode31_base, __eamode31 - __samode31); - memblock_reserve((unsigned long)_stext, PFN_PHYS(start_pfn) - - (unsigned long)_stext); + memblock_reserve(__pa(sclp_early_sccb), EXT_SCCB_READ_SCP); + memblock_reserve(__pa(_stext), _end - _stext); } static void __init setup_memory(void) |