From 5503dbe454478fe54b9cac3fc52d4477f52efdc9 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 20 Jan 2023 15:20:21 -0800 Subject: [PATCH] Revert "ANDROID: gki_defconfig: sample large page_alloc allocations with HW_TAGS KASAN" This reverts commit 435e2a6a6c8ba8d0eb55f9aaade53e7a3957322b. 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 4759cc9950dd..0baed5cbe022 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -56,7 +56,7 @@ CONFIG_CP15_BARRIER_EMULATION=y 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.page_alloc.sample=10 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 ioremap_guard" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y