From 31281f7f3c1b2413a4abd303ea49450ea34c9283 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 3 Mar 2023 23:01:17 +0000 Subject: [PATCH] Revert "Temporarily disable KASAN until bugfix is merged into [redacted] kernel." This reverts commit 31743404560f9449979fd500282490c52ed5164e. Reason for revert: Kernel prebuilt with bugfix has landed: ag/21613833 Bug: 265863271 Change-Id: I7c688065783303ca0666f38058fbf853be51e199 Merged-in: I7c688065783303ca0666f38058fbf853be51e199 (cherry picked from commit 82efb36664b56864239937d96a3b6e08547b9af9) --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index cf46e7f5..f8da0246 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -39,9 +39,6 @@ BOARD_KERNEL_CMDLINE += cgroup_disable=memory BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on BOARD_KERNEL_CMDLINE += swiotlb=1024 -# TODO(pcc): Remove this once the shusky kernel is updated with -# https://android-review.git.corp.google.com/q/topic:%22kasan-mte-sampling-again%22 -BOARD_KERNEL_CMDLINE += kasan=off BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs TARGET_NO_BOOTLOADER := true