diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-31 10:24:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-31 10:24:30 +0000 |
| commit | 33acbc7246e9bcabaa9f18372f8010007c011887 (patch) | |
| tree | 5c7ac2999b68215c581483bc4513052c85af562d | |
| parent | 077b04892f5ddc453b982d3c6a2879a0e48abf14 (diff) | |
| parent | c9727b8ce3f877e1b658f4368a84bab4d29cccf3 (diff) | |
| download | configs-33acbc7246e9bcabaa9f18372f8010007c011887.tar.gz | |
Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799
Change-Id: If1fb98c238286b6bf93c300b295d6b0203c41268
| -rw-r--r-- | android-5.10/android-base-conditional.xml | 14 | ||||
| -rw-r--r-- | android-5.15/android-base-conditional.xml | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml index 04ac88d..9d1e9d8 100644 --- a/android-5.10/android-base-conditional.xml +++ b/android-5.10/android-base-conditional.xml @@ -202,3 +202,17 @@ <value type="bool">y</value> </config> </group> + +<!-- CONFIG_VMAP_STACK requirement --> +<group> + <conditions> + <config> + <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_VMAP_STACK</key> + <value type="bool">y</value> + </config> +</group> diff --git a/android-5.15/android-base-conditional.xml b/android-5.15/android-base-conditional.xml index db92b0a..08c572b 100644 --- a/android-5.15/android-base-conditional.xml +++ b/android-5.15/android-base-conditional.xml @@ -210,3 +210,17 @@ <value type="bool">y</value> </config> </group> + +<!-- CONFIG_VMAP_STACK requirement --> +<group> + <conditions> + <config> + <key>CONFIG_HAVE_ARCH_VMAP_STACK</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_VMAP_STACK</key> + <value type="bool">y</value> + </config> +</group> |