summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndrey Markovytch <andreym@codeaurora.org>2016-03-16 11:31:20 +0200
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:24:17 -0700
commit641612595c2925d89d13b11aec5b1351250ba9a0 (patch)
tree328441061f1ed1b4fed5716f22158327a01a0c2b /arch
parent1751e821a557e5f19a293be02b0349ccf62968d3 (diff)
defconfig: msm: enable Per-File-Key (PFK)
Enable PFK for file based encryption support. Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/msm-perf_defconfig1
-rw-r--r--arch/arm64/configs/msm_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig
index 790eb7874efe..a39afee69dfb 100644
--- a/arch/arm64/configs/msm-perf_defconfig
+++ b/arch/arm64/configs/msm-perf_defconfig
@@ -569,6 +569,7 @@ CONFIG_IPC_LOGGING=y
CONFIG_SCHED_TRACER=y
CONFIG_MEMTEST=y
CONFIG_DEBUG_SET_MODULE_RONX=y
+CONFIG_PFK=y
CONFIG_SECURITY=y
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SMACK=y
diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index 36cc87f10570..be7c84ff98dc 100644
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -595,6 +595,7 @@ CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_MEMTEST=y
CONFIG_PANIC_ON_DATA_CORRUPTION=y
+CONFIG_PFK=y
CONFIG_ARM64_PTDUMP=y
CONFIG_DEBUG_SET_MODULE_RONX=y
CONFIG_FREE_PAGES_RDONLY=y