Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 466178fc authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 604ddad0

arch/s390/include/asm/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/s390/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/s390/include/asm/setup.h

+0 −3
Original line number Diff line number Diff line
@@ -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)

arch/s390/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*