commit c9727b8ce3f877e1b658f4368a84bab4d29cccf3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 31 10:04:00 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 31 10:04:00 2022 +0000
tree 5c7ac2999b68215c581483bc4513052c85af562d
parent 8e30736b3db61cafd19e0b896ca39caa23c863bd
parent 5ef33e6af2f28b8db048473b00dd04886586d18d

Merge "Require CONFIG_VMAP_STACK on arches that support it"

android-5.10/android-base-conditional.xml

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>

android-5.15/android-base-conditional.xml

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>