diff options
| author | Michael Ellerman | 2022-07-09 19:29:34 +1000 |
|---|---|---|
| committer | Michael Ellerman | 2022-07-09 19:29:34 +1000 |
| commit | 7e74dabc3daf0c217cb5e8e849a8f6c02927950f (patch) | |
| tree | 8620e5d95e732952473eeb764aee17693e4458bd /arch/powerpc/Kconfig | |
| parent | 54c15ec3b738c6086f2be001dae962ec412640e5 (diff) | |
| parent | 887502826549caa7e4215fd9e628f48f14c0825a (diff) | |
Merge branch 'fixes' into next
Merge our fixes branch. In particular this brings in commit
986481618023 ("powerpc/book3e: Fix PUD allocation size in
map_kernel_page()") which fixes a build failure in next, because commit
2db2008e6363 ("powerpc/64e: Rewrite p4d_populate() as a static inline
function") depends on it.
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 02d040d1af85..26331cdd3642 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -360,6 +360,10 @@ config ARCH_SUSPEND_NONZERO_CPU def_bool y depends on PPC_POWERNV || PPC_PSERIES +config ARCH_HAS_ADD_PAGES + def_bool y + depends on ARCH_ENABLE_MEMORY_HOTPLUG + config PPC_DCR_NATIVE bool |