commit 54d0379c4d19e7595154316b777583df29dd1b7b
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 23 14:46:12 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 23 14:46:11 2018 -0700
tree b4ebcebaf38f81f5b34e0ff1e8c2cabccb10b4b7
parent c068727629c3dc94849481c93e7e8a48d7a09f88
parent cdfa3164d868b13f06374d03bc5afb1d3b09ef1b

Merge "memshare: Disable memshare to prevent access cached memory"

arch/arm64/configs/sdm845-perf_defconfig

diff --git a/arch/arm64/configs/sdm845-perf_defconfig b/arch/arm64/configs/sdm845-perf_defconfig
index 8f213f4..f5dc2a8 100644
--- a/arch/arm64/configs/sdm845-perf_defconfig
+++ b/arch/arm64/configs/sdm845-perf_defconfig
@@ -545,7 +545,6 @@
 CONFIG_QTI_RPM_STATS_LOG=y
 CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QMP_DEBUGFS_CLIENT=y
-CONFIG_MEM_SHARE_QMI_SERVICE=y
 CONFIG_QSEE_IPC_IRQ_BRIDGE=y
 CONFIG_QCOM_BIMC_BWMON=y
 CONFIG_ARM_MEMLAT_MON=y

arch/arm64/configs/sdm845_defconfig

diff --git a/arch/arm64/configs/sdm845_defconfig b/arch/arm64/configs/sdm845_defconfig
index ac25fb9..8a84a2d 100644
--- a/arch/arm64/configs/sdm845_defconfig
+++ b/arch/arm64/configs/sdm845_defconfig
@@ -564,7 +564,6 @@
 CONFIG_QTI_RPM_STATS_LOG=y
 CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QMP_DEBUGFS_CLIENT=y
-CONFIG_MEM_SHARE_QMI_SERVICE=y
 CONFIG_MSM_REMOTEQDSS=y
 CONFIG_QSEE_IPC_IRQ_BRIDGE=y
 CONFIG_QCOM_BIMC_BWMON=y