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

Commit 84afdcee authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] pgtable: move pte_mkhuge() from hugetlb.h to pgtable.h 



All architectures besides s390 have pte_mkhuge() defined in pgtable.h.
So move the function to pgtable.h on s390 as well.
Fixes a compile error introduced with "hugetlb: hugepage migration core"
in linux-next which only happens on s390.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 36bf9680

arch/s390/include/asm/hugetlb.h

+0 −26
Original line number Diff line number Diff line
@@ -37,32 +37,6 @@ static inline int prepare_hugepage_range(struct file *file, 
int arch_prepare_hugepage(struct page *page);

void arch_release_hugepage(struct page *page);



static inline pte_t pte_mkhuge(pte_t pte)

{

	/*

	 * PROT_NONE needs to be remapped from the pte type to the ste type.

	 * The HW invalid bit is also different for pte and ste. The pte

	 * invalid bit happens to be the same as the ste _SEGMENT_ENTRY_LARGE

	 * bit, so we don't have to clear it.

	 */

	if (pte_val(pte) & _PAGE_INVALID) {

		if (pte_val(pte) & _PAGE_SWT)

			pte_val(pte) |= _HPAGE_TYPE_NONE;

		pte_val(pte) |= _SEGMENT_ENTRY_INV;

	}

	/*

	 * Clear SW pte bits SWT and SWX, there are no SW bits in a segment

	 * table entry.

	 */

	pte_val(pte) &= ~(_PAGE_SWT | _PAGE_SWX);

	/*

	 * Also set the change-override bit because we don't need dirty bit

	 * tracking for hugetlbfs pages.

	 */

	pte_val(pte) |= (_SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_CO);

	return pte;

}



static inline pte_t huge_pte_wrprotect(pte_t pte)

{

	pte_val(pte) |= _PAGE_RO;

arch/s390/include/asm/pgtable.h

+28 −0
Original line number Diff line number Diff line
@@ -772,6 +772,34 @@ static inline pte_t pte_mkspecial(pte_t pte) 
	return pte;

}



#ifdef CONFIG_HUGETLB_PAGE

static inline pte_t pte_mkhuge(pte_t pte)

{

	/*

	 * PROT_NONE needs to be remapped from the pte type to the ste type.

	 * The HW invalid bit is also different for pte and ste. The pte

	 * invalid bit happens to be the same as the ste _SEGMENT_ENTRY_LARGE

	 * bit, so we don't have to clear it.

	 */

	if (pte_val(pte) & _PAGE_INVALID) {

		if (pte_val(pte) & _PAGE_SWT)

			pte_val(pte) |= _HPAGE_TYPE_NONE;

		pte_val(pte) |= _SEGMENT_ENTRY_INV;

	}

	/*

	 * Clear SW pte bits SWT and SWX, there are no SW bits in a segment

	 * table entry.

	 */

	pte_val(pte) &= ~(_PAGE_SWT | _PAGE_SWX);

	/*

	 * Also set the change-override bit because we don't need dirty bit

	 * tracking for hugetlbfs pages.

	 */

	pte_val(pte) |= (_SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_CO);

	return pte;

}

#endif



#ifdef CONFIG_PGSTE

/*

 * Get (and clear) the user dirty bit for a PTE.