s390/boot: Make .amode31 section address range explicit

This is a preparatory rework to allow uncoupling virtual
and physical addresses spaces.

Introduce .amode31 section address range AMODE31_START
and AMODE31_END macros for later use.

Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/include/asm/physmem_info.h b/arch/s390/include/asm/physmem_info.h
index e747b067f8dbbf34c7ee0e3922c82325838d2a43..d2f1cc7426954560acb1fb28e3d7ea41115d8aff 100644 (file)
--- a/arch/s390/include/asm/physmem_info.h
+++ b/arch/s390/include/asm/physmem_info.h
@@ -170,4 +170,7 @@ static inline unsigned long get_physmem_reserved(enum reserved_range_type type,
        return *size;
 }
 
+#define AMODE31_START  (physmem_info.reserved[RR_AMODE31].start)
+#define AMODE31_END    (physmem_info.reserved[RR_AMODE31].end)
+
 #endif

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 0544830ffb90adb7d2788fb8df59fc0faaa031c3..cbd5290939df1cb81cb8528543255d8245224a56 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -765,7 +765,7 @@ static void __init relocate_amode31_section(void)
        unsigned long amode31_size = __eamode31 - __samode31;
        long amode31_offset, *ptr;
 
-       amode31_offset = physmem_info.reserved[RR_AMODE31].start - (unsigned long)__samode31;
+       amode31_offset = AMODE31_START - (unsigned long)__samode31;
        pr_info("Relocating AMODE31 section of size 0x%08lx\n", amode31_size);
 
        /* Move original AMODE31 section to the new one */