diff options
author | Alexander Potapenko <glider@google.com> | 2022-02-07 19:09:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-07 19:09:06 +0000 |
commit | 9d91925e4505e3f6bad18d0bd438c64bcb3a107f (patch) | |
tree | 0d2ffec5c699dd6db3d4b5f0e4642e5174fed477 | |
parent | 7425df250dae971154d555a7f069b434ae5ddbc6 (diff) | |
parent | 4ca2ff98bfe8a65bc88590c6b372f59d2025be93 (diff) | |
download | configs-9d91925e4505e3f6bad18d0bd438c64bcb3a107f.tar.gz |
Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: 4ca2ff98bf
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679
Change-Id: I5965804a34fcf6469b76b5870c2bc53787907a0d
-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 404044d..53ea697 100644 --- a/android-5.10/android-base-conditional.xml +++ b/android-5.10/android-base-conditional.xml @@ -220,3 +220,17 @@ <value type="bool">y</value> </config> </group> + +<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> +<group> + <conditions> + <config> + <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_INIT_STACK_ALL_ZERO</key> + <value type="bool">y</value> + </config> +</group>
\ No newline at end of file diff --git a/android-5.15/android-base-conditional.xml b/android-5.15/android-base-conditional.xml index c6e47d7..11d3d95 100644 --- a/android-5.15/android-base-conditional.xml +++ b/android-5.15/android-base-conditional.xml @@ -228,3 +228,17 @@ <value type="bool">y</value> </config> </group> + +<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> +<group> + <conditions> + <config> + <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_INIT_STACK_ALL_ZERO</key> + <value type="bool">y</value> + </config> +</group>
\ No newline at end of file |