s390/mm: rename POPULATE_ONE2ONE to POPULATE_DIRECT

[ 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 <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/s390/boot/vmem.c b/arch/s390/boot/vmem.c
index 4d1d0d8e99cb2ee25bd90b153181b583e1d1734e..db8d7cfbc8a4c287708d142cdfebfdd07057cf91 100644 (file)
--- 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,