s390: get rid of MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE

Both MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE are just an alias for
MACHINE_HAS_EDAT1. So simply use MACHINE_HAS_EDAT1 instead.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h
index 4c7fac75090eadaa48125525d17ff247e729f9d1..cd546a245c68bf08d40d17bfc0bf7b3f647c3a22 100644 (file)
--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
@@ -14,7 +14,7 @@
 
 #define is_hugepage_only_range(mm, addr, len)  0
 #define hugetlb_free_pgd_range                 free_pgd_range
-#define hugepages_supported()                  (MACHINE_HAS_HPAGE)
+#define hugepages_supported()                  (MACHINE_HAS_EDAT1)
 
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                     pte_t *ptep, pte_t pte);

diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index d03b60d53f99e331021b7504761be673a5700970..52511866fb14d1fb3a66cd609cdd968adfb091ec 100644 (file)
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -1416,7 +1416,7 @@ static inline int pmd_trans_huge(pmd_t pmd)
 #define has_transparent_hugepage has_transparent_hugepage
 static inline int has_transparent_hugepage(void)
 {
-       return MACHINE_HAS_HPAGE ? 1 : 0;
+       return MACHINE_HAS_EDAT1 ? 1 : 0;
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 

diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 040a4b49ab42a397eb501262352197c9e4ea8464..30bdb5a027f3106b93638db082571b119a85ae6f 100644 (file)
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -59,9 +59,6 @@ extern void detect_memory_memblock(void);
 
 #define MACHINE_HAS_DIAG9C     (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C)
 #define MACHINE_HAS_ESOP       (S390_lowcore.machine_flags & MACHINE_FLAG_ESOP)
-#define MACHINE_HAS_PFMF       MACHINE_HAS_EDAT1
-#define MACHINE_HAS_HPAGE      MACHINE_HAS_EDAT1
-
 #define MACHINE_HAS_IDTE       (S390_lowcore.machine_flags & MACHINE_FLAG_IDTE)
 #define MACHINE_HAS_DIAG44     (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG44)
 #define MACHINE_HAS_EDAT1      (S390_lowcore.machine_flags & MACHINE_FLAG_EDAT1)

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 8d59f20a658f6e88c7733d1795b13edecb1f4286..e4d811f179715a5210775e03e0cf1d9c4870bd25 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -749,7 +749,7 @@ static int __init setup_hwcaps(void)
        /*
         * Huge page support HWCAP_S390_HPAGE is bit 7.
         */
-       if (MACHINE_HAS_HPAGE)
+       if (MACHINE_HAS_EDAT1)
                elf_hwcap |= HWCAP_S390_HPAGE;
 
        /*