| Message ID | 20240823032911.1238471-1-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f61d413a1c1feaa4cd04fca840564ab90124bec4 |
| Headers | show |
| Series | [1/2] powerpc/mm/64s: Move THP reqs into a separate symbol | expand |
On Fri, 23 Aug 2024 13:29:10 +1000, Michael Ellerman wrote: > Move the Kconfig symbols related to transparent hugepages (THP) under a > separate config symbol, separate from CONFIG_PPC_BOOK3S_64. > > The new symbol is automatically enabled if CONFIG_PPC_BOOK3S_64 is > enabled, so there is no behaviour change, except for the existence of > the new PPC_THP symbol. > > [...] Applied to powerpc/next. [1/2] powerpc/mm/64s: Move THP reqs into a separate symbol https://git.kernel.org/powerpc/c/f61d413a1c1feaa4cd04fca840564ab90124bec4 [2/2] powerpc/mm/64s: Restrict THP to Radix or HPT w/64K pages https://git.kernel.org/powerpc/c/87def77bb5f4b61d47538a34bb2b2cb7db3c037b cheers
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 4b0d7d4f88f6..9536e591c72a 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -84,11 +84,8 @@ config PPC_BOOK3S_64 bool "Server processors" select PPC_FPU select PPC_HAVE_PMU_SUPPORT - select HAVE_ARCH_TRANSPARENT_HUGEPAGE - select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_SPLIT_PMD_PTLOCK - select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select ARCH_SUPPORTS_HUGETLBFS select ARCH_SUPPORTS_NUMA_BALANCING select HAVE_MOVE_PMD @@ -108,6 +105,13 @@ config PPC_BOOK3E_64 endchoice +config PPC_THP + def_bool y + depends on PPC_BOOK3S_64 + select HAVE_ARCH_TRANSPARENT_HUGEPAGE + select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD + select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE + choice prompt "CPU selection" help
Move the Kconfig symbols related to transparent hugepages (THP) under a separate config symbol, separate from CONFIG_PPC_BOOK3S_64. The new symbol is automatically enabled if CONFIG_PPC_BOOK3S_64 is enabled, so there is no behaviour change, except for the existence of the new PPC_THP symbol. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/platforms/Kconfig.cputype | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)