Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[firefly-linux-kernel-4.4.55.git] / arch / s390 / mm / dump_pagetables.c

diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c
index d46cadeda204d5a51308ec7a7a4b1d2e100de0ee..8556d6be9b547eb0c22e9ad0f2efe1340d105ab1 100644 (file)
--- a/arch/s390/mm/dump_pagetables.c
+++ b/arch/s390/mm/dump_pagetables.c
@@ -18,9 +18,7 @@ enum address_markers_idx {
        KERNEL_END_NR,
        VMEMMAP_NR,
        VMALLOC_NR,
-#ifdef CONFIG_64BIT
        MODULES_NR,
-#endif
 };
 
 static struct addr_marker address_markers[] = {
@@ -29,9 +27,7 @@ static struct addr_marker address_markers[] = {
        [KERNEL_END_NR]   = {(unsigned long)&_end, "Kernel Image End"},
        [VMEMMAP_NR]      = {0, "vmemmap Area"},
        [VMALLOC_NR]      = {0, "vmalloc Area"},
-#ifdef CONFIG_64BIT
        [MODULES_NR]      = {0, "Modules Area"},
-#endif
        { -1, NULL }
 };
 
@@ -127,12 +123,6 @@ static void walk_pte_level(struct seq_file *m, struct pg_state *st,
        }
 }
 
-#ifdef CONFIG_64BIT
-#define _PMD_PROT_MASK _SEGMENT_ENTRY_PROTECT
-#else
-#define _PMD_PROT_MASK 0
-#endif
-
 static void walk_pmd_level(struct seq_file *m, struct pg_state *st,
                           pud_t *pud, unsigned long addr)
 {
@@ -145,7 +135,7 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st,
                pmd = pmd_offset(pud, addr);
                if (!pmd_none(*pmd)) {
                        if (pmd_large(*pmd)) {
-                               prot = pmd_val(*pmd) & _PMD_PROT_MASK;
+                               prot = pmd_val(*pmd) & _SEGMENT_ENTRY_PROTECT;
                                note_page(m, st, prot, 3);
                        } else
                                walk_pte_level(m, st, pmd, addr);
@@ -155,12 +145,6 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st,
        }
 }
 
-#ifdef CONFIG_64BIT
-#define _PUD_PROT_MASK _REGION3_ENTRY_RO
-#else
-#define _PUD_PROT_MASK 0
-#endif
-
 static void walk_pud_level(struct seq_file *m, struct pg_state *st,
                           pgd_t *pgd, unsigned long addr)
 {
@@ -173,7 +157,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st,
                pud = pud_offset(pgd, addr);
                if (!pud_none(*pud))
                        if (pud_large(*pud)) {
-                               prot = pud_val(*pud) & _PUD_PROT_MASK;
+                               prot = pud_val(*pud) & _REGION3_ENTRY_RO;
                                note_page(m, st, prot, 2);
                        } else
                                walk_pmd_level(m, st, pud, addr);
@@ -230,13 +214,9 @@ static int pt_dump_init(void)
         * kernel ASCE. We need this to keep the page table walker functions
         * from accessing non-existent entries.
         */
-#ifdef CONFIG_32BIT
-       max_addr = 1UL << 31;
-#else
        max_addr = (S390_lowcore.kernel_asce & _REGION_ENTRY_TYPE_MASK) >> 2;
        max_addr = 1UL << (max_addr * 11 + 31);
        address_markers[MODULES_NR].start_address = MODULES_VADDR;
-#endif
        address_markers[VMEMMAP_NR].start_address = (unsigned long) vmemmap;
        address_markers[VMALLOC_NR].start_address = VMALLOC_START;
        debugfs_create_file("kernel_page_tables", 0400, NULL, NULL, &ptdump_fops);