diff options
| author | Will Deacon <will@kernel.org> | 2025-01-17 13:52:29 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2025-01-17 13:52:29 +0000 |
| commit | 6e1173306ed57025e86aa461aac872ae65539cc4 (patch) | |
| tree | 5e6aabc3f5be746e20c517ab16a91aac27c61a3b /arch/arm64/mm | |
| parent | e190227be427c3de93de738374e6aa1865bfdc1c (diff) | |
| parent | 965e9bbe025e02ddea3f34bdcb5757411593f43e (diff) | |
Merge branch 'for-next/misc' into for-next/core
* for-next/misc:
arm64: Remove duplicate included header
arm64/Kconfig: Drop EXECMEM dependency from ARCH_WANTS_EXECMEM_LATE
arm64: asm: Fix typo in pgtable.h
arm64/mm: Ensure adequate HUGE_MAX_HSTATE
arm64/mm: Replace open encodings with PXD_TABLE_BIT
arm64/mm: Drop INIT_MM_CONTEXT()
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/hugetlbpage.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 3215adf48a1b..98a2a0e64e25 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -519,6 +519,18 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, static int __init hugetlbpage_init(void) { + /* + * HugeTLB pages are supported on maximum four page table + * levels (PUD, CONT PMD, PMD, CONT PTE) for a given base + * page size, corresponding to hugetlb_add_hstate() calls + * here. + * + * HUGE_MAX_HSTATE should at least match maximum supported + * HugeTLB page sizes on the platform. Any new addition to + * supported HugeTLB page sizes will also require changing + * HUGE_MAX_HSTATE as well. + */ + BUILD_BUG_ON(HUGE_MAX_HSTATE < 4); if (pud_sect_supported()) hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); |