commit 123fbf551255e40dc8ce127ac3538f642262ad75
author Linux Build Service Account <lnxbuild@localhost> Mon Aug 20 08:50:36 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 20 08:50:35 2018 -0700
tree 46356eb20ed5811474470442c260ca40e95962dd
parent 1aeef32e984f019b931795dfa14dc90f268e9ab3
parent 6583ae9cd6e23dab5f4ed8f6962eb7959cb898de

Merge "defconfig: msm: Enable PAN emulation"

arch/arm64/configs/msm8953-perf_defconfig

diff --git a/arch/arm64/configs/msm8953-perf_defconfig b/arch/arm64/configs/msm8953-perf_defconfig
index f3c1e7b..698857a 100644
--- a/arch/arm64/configs/msm8953-perf_defconfig
+++ b/arch/arm64/configs/msm8953-perf_defconfig
@@ -73,6 +73,7 @@
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
+CONFIG_ARM64_SW_TTBR0_PAN=y
 # CONFIG_ARM64_VHE is not set
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

arch/arm64/configs/msm8953_defconfig

diff --git a/arch/arm64/configs/msm8953_defconfig b/arch/arm64/configs/msm8953_defconfig
index 8401173c..6434a8e 100644
--- a/arch/arm64/configs/msm8953_defconfig
+++ b/arch/arm64/configs/msm8953_defconfig
@@ -76,6 +76,7 @@
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
+CONFIG_ARM64_SW_TTBR0_PAN=y
 # CONFIG_ARM64_VHE is not set
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y