diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 10:57:02 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 10:57:02 +0100 |
| commit | 03939cf0d5d5eaf4141c594e427eb5ba14fbcd91 (patch) | |
| tree | 7fd2bee2dcd0cd2879490564fb26dd78db35aaca /arch | |
| parent | 02eab44c71df05882be9352ca12d8a60f7a10649 (diff) | |
| parent | d0637c505f8a1d8c4088642f1f3e9e3b22da14f6 (diff) | |
| download | lwn-03939cf0d5d5eaf4141c594e427eb5ba14fbcd91.tar.gz lwn-03939cf0d5d5eaf4141c594e427eb5ba14fbcd91.zip | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: enable THP_SWAP for arm64
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b048561bd2a6..340e61199057 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -101,6 +101,7 @@ config ARM64 select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_NO_INSTR + select ARCH_WANTS_THP_SWAP if ARM64_4K_PAGES select ARCH_HAS_UBSAN_SANITIZE_ALL select ARM_AMBA select ARM_ARCH_TIMER diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 5a2eb6232e69..b5df82aa99e6 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -45,6 +45,12 @@ __flush_tlb_range(vma, addr, end, PUD_SIZE, false, 1) #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +static inline bool arch_thp_swp_supported(void) +{ + return !system_supports_mte(); +} +#define arch_thp_swp_supported arch_thp_swp_supported + /* * Outside of a few very special situations (e.g. hibernation), we always * use broadcast TLB invalidation instructions, therefore a spurious page |