From 9933cd0873aa445bb081d227c39146b2237b152f 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 Bug: 261894961 [cmllamas: fix trivial revert conflict] Signed-off-by: Carlos Llamas [eberman: fix trivial conflict] Signed-off-by: Elliot Berman Change-Id: Ifcb2f9b345d9826e6cffa4cd380c68bb35c60b31 --- 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 76cae674749c..1004c61cbebf 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -58,6 +58,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig ioremap_guard" +CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0