Revert "s390: Relocate vmlinux ELF data to virtual address space"

This reverts commit 9ecaa2e94e602a3cbcbfe182535f6297f7630b98.

In case CONFIG_MODULES kernel option is not defined the build fails
with the following linker error:

block/partitions/ibm.o: in function `ibm_partition':
ibm.c:(.text+0x8bc): relocation truncated to fit: R_390_PLT32DBL against undefined symbol `dasd_biodasdinfo'

Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 7880b7b3173e727a9198e6ec5ba192a2a0545995..224ff9d433eadd58c4d4b904686096ffeb80602a 100644 (file)
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -276,8 +276,8 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
 #define AMODE31_SIZE           (3 * PAGE_SIZE)
 
 #define KERNEL_IMAGE_SIZE      (512 * 1024 * 1024)
-#define __START_KERNEL         CONFIG_KERNEL_IMAGE_BASE
-#define __NO_KASLR_START_KERNEL        __START_KERNEL
+#define __START_KERNEL         0x100000
+#define __NO_KASLR_START_KERNEL        CONFIG_KERNEL_IMAGE_BASE
 #define __NO_KASLR_END_KERNEL  (__NO_KASLR_START_KERNEL + KERNEL_IMAGE_SIZE)
 
 #endif /* _S390_PAGE_H */