From c1ab330840aa690cc7bf259e7c5d4a332e58f8b5 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 20 Jan 2023 15:08:17 -0800 Subject: [PATCH] Revert "ANDROID: gki_defconfig: sample large page_alloc allocations with HW_TAGS KASAN" This reverts commit 0352e062467ecdc11971aaf3c215b88e999154fe. Reason for revert: Observed frequent boot crashes on a device with sampling KASAN enabled. Bug: 265863271 Change-Id: Ie4d9c2ffc39288a9f9a941784bf661eed14503e9 Signed-off-by: Peter Collingbourne --- 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 e230f0ac89c1..a1911464ced5 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -64,7 +64,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_ARM64_MPAM=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.page_alloc.sample=10 kasan.stacktrace=off bootconfig ioremap_guard kvm-arm.mode=protected" +CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off bootconfig ioremap_guard kvm-arm.mode=protected" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y