diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-08-14 11:54:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:57:32 +0100 |
| commit | 1b7fc7772b0d9196571b9e52de7265785064be9b (patch) | |
| tree | 16148a5e4c91dd791e1cfd1fecf1dfa9a1377656 | |
| parent | c9e96065d5c3ce59eef230b8b4de5722f95c7771 (diff) | |
| download | tip-1b7fc7772b0d9196571b9e52de7265785064be9b.tar.gz | |
headers/deps: arm64/mm: Move the hugetlb definitions from the pgtable.h hierarchy over into <asm/page.h>
It's a better fit, plus avoids circular dependencies.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/arm64/include/asm/page.h | 9 | ||||
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h index 6d07b28999d67f..12af186f962fba 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -22,6 +22,15 @@ #define vmemmap ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT)) +/* + * Hugetlb definitions. + */ +#define HUGE_MAX_HSTATE 4 +#define HPAGE_SHIFT PMD_SHIFT +#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT) +#define HPAGE_MASK (~(HPAGE_SIZE - 1)) +#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) + #ifndef __ASSEMBLY__ #include <linux/personality.h> /* for READ_IMPLIES_EXEC */ diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7760173968dcb0..dcdd851fc9d8d5 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -336,15 +336,6 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, */ #define pte_mkhuge(pte) (__pte(pte_val(pte) & ~PTE_TABLE_BIT)) -/* - * Hugetlb definitions. - */ -#define HUGE_MAX_HSTATE 4 -#define HPAGE_SHIFT PMD_SHIFT -#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT) -#define HPAGE_MASK (~(HPAGE_SIZE - 1)) -#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) - static inline pte_t pgd_pte(pgd_t pgd) { return __pte(pgd_val(pgd)); |