diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2022-02-07 16:18:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-07 16:18:11 +0000 |
| commit | 7425df250dae971154d555a7f069b434ae5ddbc6 (patch) | |
| tree | 204e335ea4e53824310f67aaf053668304662bc1 | |
| parent | 33acbc7246e9bcabaa9f18372f8010007c011887 (diff) | |
| parent | 23acefc28673b31f6bee5cd79cb5dde9d828c382 (diff) | |
| download | configs-7425df250dae971154d555a7f069b434ae5ddbc6.tar.gz | |
Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459
Change-Id: I881ef6a3406f34b64f78dce642e7bcefd56ea992
| -rw-r--r-- | android-5.10/android-base-conditional.xml | 4 | ||||
| -rw-r--r-- | android-5.15/android-base-conditional.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml index 9d1e9d8..404044d 100644 --- a/android-5.10/android-base-conditional.xml +++ b/android-5.10/android-base-conditional.xml @@ -210,6 +210,10 @@ <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_KASAN_SW_TAGS</key> + <value type="bool">n</value> + </config> </conditions> <config> <key>CONFIG_VMAP_STACK</key> diff --git a/android-5.15/android-base-conditional.xml b/android-5.15/android-base-conditional.xml index 08c572b..c6e47d7 100644 --- a/android-5.15/android-base-conditional.xml +++ b/android-5.15/android-base-conditional.xml @@ -218,6 +218,10 @@ <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_KASAN_SW_TAGS</key> + <value type="bool">n</value> + </config> </conditions> <config> <key>CONFIG_VMAP_STACK</key> |