diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-31 10:55:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-31 10:55:35 +0000 |
| commit | f32dd8c8e50bbdd2eb66919bde74cc999881854b (patch) | |
| tree | 5c7ac2999b68215c581483bc4513052c85af562d | |
| parent | 5127b1fae69a4f918aec639d8c02983ae5e760a1 (diff) | |
| parent | 609d5a9d00a9ca2c81217381a909ef07751ccd38 (diff) | |
| download | configs-f32dd8c8e50bbdd2eb66919bde74cc999881854b.tar.gz | |
Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 am: 33acbc7246 am: 609d5a9d00
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799
Change-Id: I7cc5396df8ca3b8a7b2d581492a91141bfaac78c
| -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> |