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

Commit 5f6e8da7 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: special pmd_trans_* functions 



These returns 0 at compile time when the config option is disabled, to
allow gcc to eliminate the transparent hugepage function calls at compile
time without additional #ifdefs (only the export of those functions have
to be visible to gcc but they won't be required at link time and
huge_memory.o can be not built at all).

_PAGE_BIT_UNUSED1 is never used for pmd, only on pte.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c76d9d1

arch/x86/include/asm/pgtable_64.h

+13 −0
Original line number Diff line number Diff line
@@ -168,6 +168,19 @@ extern void cleanup_highmap(void); 
#define	kc_offset_to_vaddr(o) ((o) | ~__VIRTUAL_MASK)



#define __HAVE_ARCH_PTE_SAME



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

static inline int pmd_trans_splitting(pmd_t pmd)

{

	return pmd_val(pmd) & _PAGE_SPLITTING;

}



static inline int pmd_trans_huge(pmd_t pmd)

{

	return pmd_val(pmd) & _PAGE_PSE;

}

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



#endif /* !__ASSEMBLY__ */



#endif /* _ASM_X86_PGTABLE_64_H */

arch/x86/include/asm/pgtable_types.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define _PAGE_BIT_PAT_LARGE	12	/* On 2MB or 1GB pages */

#define _PAGE_BIT_SPECIAL	_PAGE_BIT_UNUSED1

#define _PAGE_BIT_CPA_TEST	_PAGE_BIT_UNUSED1

#define _PAGE_BIT_SPLITTING	_PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */



/* If _PAGE_BIT_PRESENT is clear, we use these: */
@@ -45,6 +46,7 @@ 
#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)

#define _PAGE_CPA_TEST	(_AT(pteval_t, 1) << _PAGE_BIT_CPA_TEST)

#define _PAGE_SPLITTING	(_AT(pteval_t, 1) << _PAGE_BIT_SPLITTING)

#define __HAVE_ARCH_PTE_SPECIAL



#ifdef CONFIG_KMEMCHECK

include/asm-generic/pgtable.h

+11 −0
Original line number Diff line number Diff line
@@ -348,6 +348,17 @@ extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn, 
				unsigned long size);

#endif



#ifndef CONFIG_TRANSPARENT_HUGEPAGE

static inline int pmd_trans_huge(pmd_t pmd)

{

	return 0;

}

static inline int pmd_trans_splitting(pmd_t pmd)

{

	return 0;

}

#endif



#endif /* !__ASSEMBLY__ */



#endif /* _ASM_GENERIC_PGTABLE_H */