diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2022-11-28 14:14:27 +0100 |
|---|---|---|
| committer | Alexander Gordeev <agordeev@linux.ibm.com> | 2022-12-06 16:18:24 +0100 |
| commit | a4c41fe3985d4c1c31d84833b30fd9ac48fe6f84 (patch) | |
| tree | 3d25077820b9781c7c014bea481a74ce3b7bb2d3 | |
| parent | f9e5938ace2cc8ecf15815649481266017135757 (diff) | |
| download | linux-a4c41fe3985d4c1c31d84833b30fd9ac48fe6f84.tar.gz linux-a4c41fe3985d4c1c31d84833b30fd9ac48fe6f84.tar.bz2 linux-a4c41fe3985d4c1c31d84833b30fd9ac48fe6f84.zip | |
s390/sclp: keep sclp_early_sccb
Keep sclp_early_sccb so it can also be used after initdata has been
freed. This is a prerequisite to allow printing a message from the
machine check handler.
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
| -rw-r--r-- | arch/s390/mm/init.c | 3 | ||||
| -rw-r--r-- | drivers/s390/char/sclp_early_core.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index a28832eefb06..1a25d456d865 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -208,9 +208,6 @@ void free_initmem(void) __set_memory((unsigned long)_sinittext, (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT, SET_MEMORY_RW | SET_MEMORY_NX); - free_reserved_area(sclp_early_sccb, - sclp_early_sccb + EXT_SCCB_READ_SCP, - POISON_FREE_INITMEM, "unused early sccb"); free_initmem_default(POISON_FREE_INITMEM); } diff --git a/drivers/s390/char/sclp_early_core.c b/drivers/s390/char/sclp_early_core.c index 676634de65a8..baf1cd2b0854 100644 --- a/drivers/s390/char/sclp_early_core.c +++ b/drivers/s390/char/sclp_early_core.c @@ -17,7 +17,7 @@ static struct read_info_sccb __bootdata(sclp_info_sccb); static int __bootdata(sclp_info_sccb_valid); -char *__bootdata(sclp_early_sccb); +char *__bootdata_preserved(sclp_early_sccb); int sclp_init_state = sclp_init_state_uninitialized; /* * Used to keep track of the size of the event masks. Qemu until version 2.11 |