diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2022-02-07 16:50:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-07 16:50:44 +0000 |
| commit | 5c3e2f4d00ed3060184f4830319a076eadcf9959 (patch) | |
| tree | 204e335ea4e53824310f67aaf053668304662bc1 | |
| parent | f32dd8c8e50bbdd2eb66919bde74cc999881854b (diff) | |
| parent | 85563c35e9da65d104b1a30bba65d55c8baa1a1a (diff) | |
| download | configs-5c3e2f4d00ed3060184f4830319a076eadcf9959.tar.gz | |
Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250d am: 85563c35e9
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459
Change-Id: I074736e30b19ca54ad3a9f8fbecf01701022ea14
| -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> |