Skip to content

Commit 1812dc9

Browse files
author
Alexander Gordeev
committed
Revert "s390: Relocate vmlinux ELF data to virtual address space"
This reverts commit 9ecaa2e. 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>
1 parent 22a49f6 commit 1812dc9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/s390/include/asm/page.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
276276
#define AMODE31_SIZE (3 * PAGE_SIZE)
277277

278278
#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024)
279-
#define __START_KERNEL CONFIG_KERNEL_IMAGE_BASE
280-
#define __NO_KASLR_START_KERNEL __START_KERNEL
279+
#define __START_KERNEL 0x100000
280+
#define __NO_KASLR_START_KERNEL CONFIG_KERNEL_IMAGE_BASE
281281
#define __NO_KASLR_END_KERNEL (__NO_KASLR_START_KERNEL + KERNEL_IMAGE_SIZE)
282282

283283
#endif /* _S390_PAGE_H */

0 commit comments

Comments
 (0)