From d6dd1e096f0bb582d92714dcef670b86d0e37406 Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: May 07 2023 23:11:24 +0000 Subject: config: use ARCH_FORCE_MAX_ORDER=8 on ppc64/ppc64le Mainline commit 23baf831a32c ("mm, treewide: redefine MAX_ORDER sanely") redefined the meaning of MAX_ORDER, and therefore also related ARCH_FORCE_MAX_ORDER config option to be one lower than the old value so that having ARCH_FORCE_MAX_ORDER=9 with 64KB pages results in build time error "Allocator MAX_ORDER exceeds SECTION_SIZE". Update the values on ppc64 and ppc64le architectures from 9 to 8 to preserve the old behaviour and fix the build error. --- diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla index 4cf4027..fe921c4 100644 --- a/config/ppc64/vanilla +++ b/config/ppc64/vanilla @@ -542,7 +542,7 @@ CONFIG_PAGE_SIZE_64KB=y CONFIG_PPC_PAGE_SHIFT=16 CONFIG_THREAD_SHIFT=14 CONFIG_DATA_SHIFT=24 -CONFIG_ARCH_FORCE_MAX_ORDER=9 +CONFIG_ARCH_FORCE_MAX_ORDER=8 CONFIG_PPC_SUBPAGE_PROT=y # CONFIG_PPC_PROT_SAO_LPAR is not set CONFIG_PPC_COPRO_BASE=y diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla index 77f614b..73bd938 100644 --- a/config/ppc64le/vanilla +++ b/config/ppc64le/vanilla @@ -502,7 +502,7 @@ CONFIG_PAGE_SIZE_64KB=y CONFIG_PPC_PAGE_SHIFT=16 CONFIG_THREAD_SHIFT=14 CONFIG_DATA_SHIFT=24 -CONFIG_ARCH_FORCE_MAX_ORDER=9 +CONFIG_ARCH_FORCE_MAX_ORDER=8 CONFIG_PPC_SUBPAGE_PROT=y # CONFIG_PPC_PROT_SAO_LPAR is not set CONFIG_PPC_COPRO_BASE=y