remove SMP condition from PAGE_TABLE_ISOLATION
The requirement for CONFIG_PAGE_TABLE_ISOLATION is unconditionally
required by CTS, so do the same here.
Bug: 113129213
Change-Id: I1c238c85cfb0886ff86dbedabb5280dbe2f74263
diff --git a/android-4.14/android-base-conditional.xml b/android-4.14/android-base-conditional.xml
index d5815dc..fb01d35 100644
--- a/android-4.14/android-base-conditional.xml
+++ b/android-4.14/android-base-conditional.xml
@@ -108,25 +108,11 @@
<value type="bool">n</value>
</config>
<config>
- <key>CONFIG_RETPOLINE</key>
+ <key>CONFIG_PAGE_TABLE_ISOLATION</key>
<value type="bool">y</value>
</config>
-</group>
-
-<!-- x86 SMP-specific requirements -->
-<group>
- <conditions>
- <config>
- <key>CONFIG_X86</key>
- <value type="bool">y</value>
- </config>
- <config>
- <key>CONFIG_SMP</key>
- <value type="bool">y</value>
- </config>
- </conditions>
<config>
- <key>CONFIG_PAGE_TABLE_ISOLATION</key>
+ <key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
</group>
diff --git a/android-4.4/android-base-conditional.xml b/android-4.4/android-base-conditional.xml
index e0c67de..7a0462d 100644
--- a/android-4.4/android-base-conditional.xml
+++ b/android-4.4/android-base-conditional.xml
@@ -70,25 +70,11 @@
</config>
</conditions>
<config>
- <key>CONFIG_RETPOLINE</key>
+ <key>CONFIG_PAGE_TABLE_ISOLATION</key>
<value type="bool">y</value>
</config>
-</group>
-
-<!-- x86 SMP-specific requirements -->
-<group>
- <conditions>
- <config>
- <key>CONFIG_X86</key>
- <value type="bool">y</value>
- </config>
- <config>
- <key>CONFIG_SMP</key>
- <value type="bool">y</value>
- </config>
- </conditions>
<config>
- <key>CONFIG_PAGE_TABLE_ISOLATION</key>
+ <key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
</group>
diff --git a/android-4.9/android-base-conditional.xml b/android-4.9/android-base-conditional.xml
index ac99104..9d55ccf 100644
--- a/android-4.9/android-base-conditional.xml
+++ b/android-4.9/android-base-conditional.xml
@@ -70,25 +70,11 @@
</config>
</conditions>
<config>
- <key>CONFIG_RETPOLINE</key>
+ <key>CONFIG_PAGE_TABLE_ISOLATION</key>
<value type="bool">y</value>
</config>
-</group>
-
-<!-- x86 SMP-specific requirements -->
-<group>
- <conditions>
- <config>
- <key>CONFIG_X86</key>
- <value type="bool">y</value>
- </config>
- <config>
- <key>CONFIG_SMP</key>
- <value type="bool">y</value>
- </config>
- </conditions>
<config>
- <key>CONFIG_PAGE_TABLE_ISOLATION</key>
+ <key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
</group>
