remove CONFIG_UNMAP_KERNEL_AT_EL0 from ARM64 requirements Some platforms do not require this mitigation. For platforms that do, this config requirement will continue to be enforced in CTS. Bug: 135948601 Change-Id: I6a3cb5f4a003b0fbd80dbb412a451cd1b94e5eca Signed-off-by: Steve Muckle <smuckle@google.com>
diff --git a/q/android-4.14/android-base-conditional.xml b/q/android-4.14/android-base-conditional.xml index 196ed33..43e534a 100644 --- a/q/android-4.14/android-base-conditional.xml +++ b/q/android-4.14/android-base-conditional.xml
@@ -55,10 +55,6 @@ <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> - <config> - <key>CONFIG_UNMAP_KERNEL_AT_EL0</key> - <value type="bool">y</value> - </config> </group> <!-- For ARM64, CONFIG_ARM64_SW_TTBR0_PAN || CONFIG_ARM64_PAN -->
diff --git a/q/android-4.19/android-base-conditional.xml b/q/android-4.19/android-base-conditional.xml index 395fc67..265abf0 100644 --- a/q/android-4.19/android-base-conditional.xml +++ b/q/android-4.19/android-base-conditional.xml
@@ -55,10 +55,6 @@ <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> - <config> - <key>CONFIG_UNMAP_KERNEL_AT_EL0</key> - <value type="bool">y</value> - </config> </group> <!-- For ARM64, CONFIG_ARM64_SW_TTBR0_PAN || CONFIG_ARM64_PAN -->
diff --git a/q/android-4.9/android-base-conditional.xml b/q/android-4.9/android-base-conditional.xml index f3ca455..0ba7e5b 100644 --- a/q/android-4.9/android-base-conditional.xml +++ b/q/android-4.9/android-base-conditional.xml
@@ -55,10 +55,6 @@ <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> - <config> - <key>CONFIG_UNMAP_KERNEL_AT_EL0</key> - <value type="bool">y</value> - </config> </group> <!-- x86 base requirements -->