From f0bd864fe002395fd8a120e9ef9fe70ca593e269 Mon Sep 17 00:00:00 2001 From: Isaac Manjarres Date: Mon, 16 Jun 2025 13:43:19 -0700 Subject: [PATCH] Revert "ANDROID: mm: Set PAGE_BLOCK_ORDER to 7 when ARM64_16K_PAGES" This reverts commit 45afa562802ae9a253ef437dd0010c8c2ec17806. Reason for revert: This was a workaround due to the kernel build tools preserving the # nocheck comment as part of the config option for CONFIG_PAGE_BLOCK_ORDER, which is problematic, since it is supposed to be an int. The build tools have been patched to not do that anymore, so this can be removed. Bug: 424212284 Bug: 375647879 Bug: 355449177 Bug: 418282543 Change-Id: Ib999aea150c1c5f7f22ea6bdd81de0ec75f8efaf Signed-off-by: Isaac J. Manjarres --- mm/Kconfig | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index 48ee73e3ec59..2b86f4fd9abd 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1001,13 +1001,6 @@ config CMA_AREAS config ARCH_FORCE_MAX_ORDER int -# -# Select this config option from the ARM64 architecture Kconfig to set -# the page size to 16KB. -# See b/424212284 for more information. -config ARM64_16K_PAGES - bool - # # When ARCH_FORCE_MAX_ORDER is not defined, # the default page block order is MAX_PAGE_ORDER (10) as per @@ -1017,7 +1010,6 @@ config PAGE_BLOCK_ORDER int "Page Block Order" range 1 10 if ARCH_FORCE_MAX_ORDER = 0 || ARCH_FORCE_MAX_ORDER = "" default 10 if ARCH_FORCE_MAX_ORDER = 0 || ARCH_FORCE_MAX_ORDER = "" - default 7 if ARM64_16K_PAGES range 1 ARCH_FORCE_MAX_ORDER if ARCH_FORCE_MAX_ORDER != 0 default ARCH_FORCE_MAX_ORDER if ARCH_FORCE_MAX_ORDER != 0 help