From f22b02c4734528b9236a218ade97555cfae01fbf Mon Sep 17 00:00:00 2001 From: Vincent Donnefort Date: Wed, 8 Jan 2025 18:12:48 +0000 Subject: [PATCH] ANDROID: GKI: Remove ioremap_guard from cmdline The upstream version for guest's ioremap_guard does not use this cmdline option. Let's remove it. Bug: 357781595 Change-Id: I42eb3da522d5207759bde5b95c24c0dc362048a8 Signed-off-by: Vincent Donnefort --- arch/arm64/configs/gki_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 5b5380c64ff5..aa57826df48a 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -69,7 +69,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set CONFIG_UNWIND_PATCH_PAC_INTO_SCS=y -CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig ioremap_guard" +CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_HIBERNATION=y