From 1cde7a1a6dd24b2b2a1761259b794becec3cfe8a Mon Sep 17 00:00:00 2001 From: Carlos Llamas Date: Sun, 19 Sep 2021 15:32:02 +0000 Subject: [PATCH] Revert "ANDROID: GKI: remove CONFIG_CMDLINE_EXTEND from arm64 gki_defconfig" This reverts commit 4c2fb69cfa1f9c1605b00a5cc90f9398692d8366. Bring back CONFIG_CMDLINE_EXTEND while we wait for an alternative solution to be accepted upstream. Bug: 120440972 [cmllamas: fix trivial revert conflict] Signed-off-by: Carlos Llamas Change-Id: I5d917d07d517ea07f5936a04b5f2b505af7c2b2d --- arch/arm64/configs/gki_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index f873c75b94df..34ebd09a2727 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -63,6 +63,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off cgroup_disable=pressure" +CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0