diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2023-08-25 14:29:49 +0200 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2023-08-30 11:03:27 +0200 |
| commit | 3eeb07788ff05b30e2ddad39561d53495563e63a (patch) | |
| tree | 712d75abbee7657d0082d3e2241bad2c53b72750 /arch/s390/mm | |
| parent | c0f1d478121131c2a97cab24148bf7ebb7ed3434 (diff) | |
| download | linux-stable-3eeb07788ff05b30e2ddad39561d53495563e63a.tar.gz linux-stable-3eeb07788ff05b30e2ddad39561d53495563e63a.tar.bz2 linux-stable-3eeb07788ff05b30e2ddad39561d53495563e63a.zip | |
s390/amode31: change type of __samode31, __eamode31, etc
For consistencs reasons change the type of __samode31, __eamode31,
__stext_amode31, and __etext_amode31 to a char pointer so they
(nearly) match the type of all other sections.
This allows for code simplifications with follow-on patches.
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/dump_pagetables.c | 4 | ||||
| -rw-r--r-- | arch/s390/mm/vmem.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c index afa5db750d92..b51666967aa1 100644 --- a/arch/s390/mm/dump_pagetables.c +++ b/arch/s390/mm/dump_pagetables.c @@ -290,8 +290,8 @@ static int pt_dump_init(void) max_addr = (S390_lowcore.kernel_asce & _REGION_ENTRY_TYPE_MASK) >> 2; max_addr = 1UL << (max_addr * 11 + 31); address_markers[IDENTITY_AFTER_END_NR].start_address = ident_map_size; - address_markers[AMODE31_START_NR].start_address = __samode31; - address_markers[AMODE31_END_NR].start_address = __eamode31; + address_markers[AMODE31_START_NR].start_address = (unsigned long)__samode31; + address_markers[AMODE31_END_NR].start_address = (unsigned long)__eamode31; address_markers[MODULES_NR].start_address = MODULES_VADDR; address_markers[MODULES_END_NR].start_address = MODULES_END; address_markers[ABS_LOWCORE_NR].start_address = __abs_lowcore; diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 261eea21ca10..9b31dc565bc5 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -657,8 +657,8 @@ void __init vmem_map_init(void) (unsigned long)(__end_rodata - _etext) >> PAGE_SHIFT); set_memory_rox((unsigned long)_sinittext, (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT); - set_memory_rox(__stext_amode31, - (__etext_amode31 - __stext_amode31) >> PAGE_SHIFT); + set_memory_rox((unsigned long)__stext_amode31, + (unsigned long)(__etext_amode31 - __stext_amode31) >> PAGE_SHIFT); /* lowcore must be executable for LPSWE */ if (!static_key_enabled(&cpu_has_bear)) |