diff --git a/patches.kernel.org/6.3.3-243-s390-mm-rename-POPULATE_ONE2ONE-to-POPULATE_DIR.patch b/patches.kernel.org/6.3.3-243-s390-mm-rename-POPULATE_ONE2ONE-to-POPULATE_DIR.patch new file mode 100644 index 0000000..dea4a61 --- /dev/null +++ b/patches.kernel.org/6.3.3-243-s390-mm-rename-POPULATE_ONE2ONE-to-POPULATE_DIR.patch @@ -0,0 +1,61 @@ +From: Heiko Carstens +Date: Tue, 9 May 2023 16:31:14 +0200 +Subject: [PATCH] s390/mm: rename POPULATE_ONE2ONE to POPULATE_DIRECT +References: bsc#1012628 +Patch-mainline: 6.3.3 +Git-commit: 07fdd6627f7f9c72ed68d531653b56df81da9996 + +[ Upstream commit 07fdd6627f7f9c72ed68d531653b56df81da9996 ] + +Architectures generally use the "direct map" wording for mapping the whole +physical memory. Use that wording as well in arch/s390/boot/vmem.c, instead +of "one to one" in order to avoid confusion. + +This also matches what is already done in arch/s390/mm/vmem.c. + +Reviewed-by: Alexander Gordeev +Signed-off-by: Heiko Carstens +Signed-off-by: Vasily Gorbik +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Jiri Slaby +--- + arch/s390/boot/vmem.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/s390/boot/vmem.c b/arch/s390/boot/vmem.c +index 4d1d0d8e..db8d7cfb 100644 +--- a/arch/s390/boot/vmem.c ++++ b/arch/s390/boot/vmem.c +@@ -29,7 +29,7 @@ unsigned long __bootdata(pgalloc_low); + + enum populate_mode { + POPULATE_NONE, +- POPULATE_ONE2ONE, ++ POPULATE_DIRECT, + POPULATE_ABS_LOWCORE, + }; + +@@ -102,7 +102,7 @@ static unsigned long _pa(unsigned long addr, enum populate_mode mode) + switch (mode) { + case POPULATE_NONE: + return -1; +- case POPULATE_ONE2ONE: ++ case POPULATE_DIRECT: + return addr; + case POPULATE_ABS_LOWCORE: + return __abs_lowcore_pa(addr); +@@ -251,9 +251,9 @@ void setup_vmem(unsigned long asce_limit) + * the lowcore and create the identity mapping only afterwards. + */ + pgtable_populate_init(); +- pgtable_populate(0, sizeof(struct lowcore), POPULATE_ONE2ONE); ++ pgtable_populate(0, sizeof(struct lowcore), POPULATE_DIRECT); + for_each_mem_detect_usable_block(i, &start, &end) +- pgtable_populate(start, end, POPULATE_ONE2ONE); ++ pgtable_populate(start, end, POPULATE_DIRECT); + pgtable_populate(__abs_lowcore, __abs_lowcore + sizeof(struct lowcore), + POPULATE_ABS_LOWCORE); + pgtable_populate(__memcpy_real_area, __memcpy_real_area + PAGE_SIZE, +-- +2.35.3 + diff --git a/series.conf b/series.conf index 4f87ca6..7a30457 100644 --- a/series.conf +++ b/series.conf @@ -976,6 +976,7 @@ patches.kernel.org/6.3.3-240-x86-fix-clear_user_rep_good-exception-handling-.patch patches.kernel.org/6.3.3-241-spi-fsl-spi-Re-organise-transfer-bits_per_word-.patch patches.kernel.org/6.3.3-242-spi-fsl-cpm-Use-16-bit-mode-for-large-transfers.patch + patches.kernel.org/6.3.3-243-s390-mm-rename-POPULATE_ONE2ONE-to-POPULATE_DIR.patch ######################################################## # Build fixes that apply to the vanilla kernel too.