diff options
| author | Alexander Gordeev <agordeev@linux.ibm.com> | 2024-02-21 11:51:55 +0100 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2024-02-26 10:25:09 +0100 |
| commit | 3334fda639cfa7bb27a457f85f4ce06d622e0511 (patch) | |
| tree | 21cb04dd36f253d1b63c8100a311202565870eec /arch/s390 | |
| parent | a795e5d2347def129734a7f247ac70339d50d8c2 (diff) | |
| download | linux-3334fda639cfa7bb27a457f85f4ce06d622e0511.tar.gz | |
s390/boot: simplify GOT handling
The end of GOT is calculated dynamically on boot. The size of GOT
is calculated on build from the start and end of GOT. Avoid both
calculations and use the end of GOT directly.
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/boot/boot.h | 4 | ||||
| -rw-r--r-- | arch/s390/boot/startup.c | 8 | ||||
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/arch/s390/boot/boot.h b/arch/s390/boot/boot.h index 8943d5be7ca288..cebf9feba6b1c4 100644 --- a/arch/s390/boot/boot.h +++ b/arch/s390/boot/boot.h @@ -30,8 +30,8 @@ struct vmlinux_info { unsigned long rela_dyn_start; unsigned long rela_dyn_end; #else - unsigned long got_off; - unsigned long got_size; + unsigned long got_start; + unsigned long got_end; #endif unsigned long amode31_size; unsigned long init_mm_off; diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c index cb0d89801c43a9..c1a758921b7a12 100644 --- a/arch/s390/boot/startup.c +++ b/arch/s390/boot/startup.c @@ -221,11 +221,8 @@ static void kaslr_adjust_got(unsigned long offset) * Even without -fPIE, Clang still uses a global offset table for some * reason. Adjust the GOT entries. */ - for (entry = (u64 *)vmlinux.got_off; - entry < (u64 *)(vmlinux.got_off + vmlinux.got_size); - entry++) { + for (entry = (u64 *)vmlinux.got_start; entry < (u64 *)vmlinux.got_end; entry++) *entry += offset; - } } #endif @@ -366,7 +363,8 @@ static void kaslr_adjust_vmlinux_info(unsigned long offset) vmlinux.rela_dyn_end += offset; vmlinux.dynsym_start += offset; #else - vmlinux.got_off += offset; + vmlinux.got_start += offset; + vmlinux.got_end += offset; #endif vmlinux.init_mm_off += offset; vmlinux.swapper_pg_dir_off += offset; diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 9c59715d17456a..48de296e8905c1 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -244,8 +244,8 @@ SECTIONS QUAD(__rela_dyn_start) /* rela_dyn_start */ QUAD(__rela_dyn_end) /* rela_dyn_end */ #else - QUAD(__got_start) /* got_off */ - QUAD(__got_end - __got_start) /* got_size */ + QUAD(__got_start) /* got_start */ + QUAD(__got_end) /* got_end */ #endif QUAD(_eamode31 - _samode31) /* amode31_size */ QUAD(init_mm) |