s390: Remove remaining _PAGE_* macros

The introduction of vdso/page.h made the definition of _PAGE_SHIFT,
_PAGE_SIZE, _PAGE_MASK redundant.

Refactor the code to remove the macros.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241014151340.1639555-4-vincenzo.frascino@arm.com
Closes: https://lore.kernel.org/oe-kbuild-all/202410112106.mvc2U2p0-lkp@intel.com/

diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index dbc25dc5fa0a321265651c00436d5c7387632eef..b7ba87f89761630523bb56fa9af37dc86c9dcbec 100644 (file)
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -13,9 +13,6 @@
 
 #include <vdso/page.h>
 
-#define _PAGE_SHIFT    PAGE_SHIFT
-#define _PAGE_SIZE     PAGE_SIZE
-#define _PAGE_MASK     PAGE_MASK
 #define PAGE_DEFAULT_ACC       _AC(0, UL)
 /* storage-protection override */
 #define PAGE_SPO_ACC           9

diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 0ffbaf7419558b5afe6749e9cf28f49f04b60933..8b67036edb697e279cb7a912e09fe0f83393ba49 100644 (file)
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -338,7 +338,7 @@ static inline int is_module_addr(void *addr)
 #define _REGION2_INDEX (0x7ffUL << _REGION2_SHIFT)
 #define _REGION3_INDEX (0x7ffUL << _REGION3_SHIFT)
 #define _SEGMENT_INDEX (0x7ffUL << _SEGMENT_SHIFT)
-#define _PAGE_INDEX    (0xffUL  << _PAGE_SHIFT)
+#define _PAGE_INDEX    (0xffUL  << PAGE_SHIFT)
 
 #define _REGION1_SIZE  (1UL << _REGION1_SHIFT)
 #define _REGION2_SIZE  (1UL << _REGION2_SHIFT)

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index ad8b0d6b77ea16a6e6f7a8beec405ecca77022fe..12e10269dfcd6a6b7ef0088b16b3e9101ad2fabd 100644 (file)
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -147,7 +147,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                        goto out;
                table = __va(entry & _SEGMENT_ENTRY_ORIGIN);
        }
-       table += (address & _PAGE_INDEX) >> _PAGE_SHIFT;
+       table += (address & _PAGE_INDEX) >> PAGE_SHIFT;
        if (get_kernel_nofault(entry, table))
                goto bad;
        pr_cont("P:%016lx ", entry);

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index eb0b51a36be013a728c80315254c9e898e1bb56f..346ec059c8bd74dbf1cc75ab708b9bfb84987250 100644 (file)
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -851,7 +851,7 @@ static inline unsigned long *gmap_table_walk(struct gmap *gmap,
                if (*table & _REGION_ENTRY_INVALID)
                        return NULL;
                table = __va(*table & _SEGMENT_ENTRY_ORIGIN);
-               table += (gaddr & _PAGE_INDEX) >> _PAGE_SHIFT;
+               table += (gaddr & _PAGE_INDEX) >> PAGE_SHIFT;
        }
        return table;
 }
@@ -1317,7 +1317,7 @@ static void gmap_unshadow_page(struct gmap *sg, unsigned long raddr)
        table = gmap_table_walk(sg, raddr, 0); /* get page table pointer */
        if (!table || *table & _PAGE_INVALID)
                return;
-       gmap_call_notifier(sg, raddr, raddr + _PAGE_SIZE - 1);
+       gmap_call_notifier(sg, raddr, raddr + PAGE_SIZE - 1);
        ptep_unshadow_pte(sg->mm, raddr, (pte_t *) table);
 }
 
@@ -1335,7 +1335,7 @@ static void __gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr,
        int i;
 
        BUG_ON(!gmap_is_shadow(sg));
-       for (i = 0; i < _PAGE_ENTRIES; i++, raddr += _PAGE_SIZE)
+       for (i = 0; i < _PAGE_ENTRIES; i++, raddr += PAGE_SIZE)
                pgt[i] = _PAGE_INVALID;
 }
 

diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index f691e0fb66a250a3732a3005e1e630f00fcc5d6e..58696a0c4e4ac7c79b05236809f33717216dc79f 100644 (file)
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -278,7 +278,7 @@ static inline unsigned long base_##NAME##_addr_end(unsigned long addr,      \
        return (next - 1) < (end - 1) ? next : end;                     \
 }
 
-BASE_ADDR_END_FUNC(page,    _PAGE_SIZE)
+BASE_ADDR_END_FUNC(page,    PAGE_SIZE)
 BASE_ADDR_END_FUNC(segment, _SEGMENT_SIZE)
 BASE_ADDR_END_FUNC(region3, _REGION3_SIZE)
 BASE_ADDR_END_FUNC(region2, _REGION2_SIZE)
@@ -302,7 +302,7 @@ static int base_page_walk(unsigned long *origin, unsigned long addr,
        if (!alloc)
                return 0;
        pte = origin;
-       pte += (addr & _PAGE_INDEX) >> _PAGE_SHIFT;
+       pte += (addr & _PAGE_INDEX) >> PAGE_SHIFT;
        do {
                next = base_page_addr_end(addr, end);
                *pte = base_lra(addr);