aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincenzo Frascino2020-01-10 06:28:07 -0600
committerGreg Kroah-Hartman2020-02-05 08:43:50 -0600
commit3ac901fc064ddcfbe3e24af4a25f67ee182e4581 (patch)
treeb968fb7885ae26c56c984aad25bd55b24606fb55
parent8071075d6e9fcb925568febf3091a4f85da6397b (diff)
downloadkernel-3ac901fc064ddcfbe3e24af4a25f67ee182e4581.tar.gz
kernel-3ac901fc064ddcfbe3e24af4a25f67ee182e4581.tar.xz
kernel-3ac901fc064ddcfbe3e24af4a25f67ee182e4581.zip
tee: optee: Fix compilation issue with nommu
[ Upstream commit 9e0caab8e0f96f0af7d1dd388e62f44184a75372 ] The optee driver uses specific page table types to verify if a memory region is normal. These types are not defined in nommu systems. Trying to compile the driver in these systems results in a build error: linux/drivers/tee/optee/call.c: In function ‘is_normal_memory’: linux/drivers/tee/optee/call.c:533:26: error: ‘L_PTE_MT_MASK’ undeclared (first use in this function); did you mean ‘PREEMPT_MASK’? return (pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC; ^~~~~~~~~~~~~ PREEMPT_MASK linux/drivers/tee/optee/call.c:533:26: note: each undeclared identifier is reported only once for each function it appears in linux/drivers/tee/optee/call.c:533:44: error: ‘L_PTE_MT_WRITEALLOC’ undeclared (first use in this function) return (pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC; ^~~~~~~~~~~~~~~~~~~ Make the optee driver depend on MMU to fix the compilation issue. Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> [jw: update commit title] Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/tee/optee/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig
index 3c59e19029be..3c1ec4e9ed29 100644
--- a/drivers/tee/optee/Kconfig
+++ b/drivers/tee/optee/Kconfig
@@ -2,6 +2,7 @@
2config OPTEE 2config OPTEE
3 tristate "OP-TEE" 3 tristate "OP-TEE"
4 depends on HAVE_ARM_SMCCC 4 depends on HAVE_ARM_SMCCC
5 depends on MMU
5 help 6 help
6 This implements the OP-TEE Trusted Execution Environment (TEE) 7 This implements the OP-TEE Trusted Execution Environment (TEE)
7 driver. 8 driver.