diff options
| author |   Vasily Gorbik <gor@linux.ibm.com> | 2020-10-08 15:07:27 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2021-06-18 16:41:19 +0200 |
| commit | 6a9100ad132c61e4ff345277862e3fecfb7cdf0e (patch) | |
| tree | a3957c5963e7ad2af8cac0c22e0ffee392363b15 /arch/s390/kernel/setup.c | |
| parent | s390: setup kernel memory layout early (diff) | |
| download | linux-dev-6a9100ad132c61e4ff345277862e3fecfb7cdf0e.tar.xz linux-dev-6a9100ad132c61e4ff345277862e3fecfb7cdf0e.zip | |
s390/setup: cleanup reserve/remove_oldmem
Since OLDMEM_BASE/OLDMEM_SIZE is already taken into consideration and is
reflected in ident_map_size. reserve/remove_oldmem() is no longer needed
and could be removed.
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 9145ef983f38..b58ee83f30e3 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -586,30 +586,6 @@ static void __init reserve_above_ident_map(void) } /* - * Make sure that oldmem, where the dump is stored, is protected - */ -static void __init reserve_oldmem(void) -{ -#ifdef CONFIG_CRASH_DUMP - if (OLDMEM_BASE) - /* Forget all memory above the running kdump system */ - memblock_reserve(OLDMEM_SIZE, (phys_addr_t)ULONG_MAX); -#endif -} - -/* - * Make sure that oldmem, where the dump is stored, is protected - */ -static void __init remove_oldmem(void) -{ -#ifdef CONFIG_CRASH_DUMP - if (OLDMEM_BASE) - /* Forget all memory above the running kdump system */ - memblock_remove(OLDMEM_SIZE, (phys_addr_t)ULONG_MAX); -#endif -} - -/* * Reserve memory for kdump kernel to be loaded with kexec */ static void __init reserve_crashkernel(void) @@ -1074,7 +1050,6 @@ void __init setup_arch(char **cmdline_p) /* Do some memory reservations *before* memory is added to memblock */ reserve_above_ident_map(); - reserve_oldmem(); reserve_kernel(); reserve_initrd(); reserve_certificate_list(); @@ -1085,7 +1060,6 @@ void __init setup_arch(char **cmdline_p) memblock_add_mem_detect_info(); free_mem_detect_info(); - remove_oldmem(); setup_uv(); setup_memory_end(); |