summaryrefslogtreecommitdiff
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@de.ibm.com>2019-01-29 17:15:11 +0300
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2019-02-07 13:56:55 +0300
commitea0ca93d6a306151c43c493cc9fe0b0d221f651a (patch)
treee1cf4070faeacb612ac4caa285a58846c3f1f308 /arch/s390/kernel
parent7dd541a3fb34b34f0f25154dd0d24d0d9b1ca0f3 (diff)
downloadlinux-ea0ca93d6a306151c43c493cc9fe0b0d221f651a.tar.xz
s390/setup: remove obsolete #ifdef
The #ifdef CONFIG_DMA_API_DEBUG check in reserve_kernel() is no longer needed, since commit ea535e418c01 ("dma-debug: switch check from _text to _stext") changed the logic in lib/dma-debug.c, so remove it. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/setup.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 5295e536515b..0ff75b3750ea 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -795,18 +795,9 @@ static void __init reserve_kernel(void)
{
unsigned long start_pfn = PFN_UP(__pa(_end));
-#ifdef CONFIG_DMA_API_DEBUG
- /*
- * DMA_API_DEBUG code stumbles over addresses from the
- * range [PARMAREA_END, _stext]. Mark the memory as reserved
- * so it is not used for CONFIG_DMA_API_DEBUG=y.
- */
- memblock_reserve(0, PFN_PHYS(start_pfn));
-#else
memblock_reserve(0, PARMAREA_END);
memblock_reserve((unsigned long)_stext, PFN_PHYS(start_pfn)
- (unsigned long)_stext);
-#endif
}
static void __init setup_memory(void)