summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiqiang Jin <liqiang.jin@amlogic.com>2019-06-10 16:55:22 +0800
committerliqiang jin <liqiang.jin@amlogic.com>2019-06-10 03:44:19 -0700
commit6c054e1526f661f9d36232550809b5531473e943 (patch)
tree11f3f68816956087c0498d7f14d12ee02b248a98
parent45da928ae2c55c6626a480cfbc72e8deaeac04c7 (diff)
downloadoptee_linuxdriver-6c054e1526f661f9d36232550809b5531473e943.tar.gz
linuxdriver: update kernel4.9(4.9.113 -> 4.9.180) compile error [1/1]
PD#SWPL-8875 Problem: macro "u64_to_user_ptr(x)" redefinition Solution: delete the macro Verify: kernel4.19 + arm64 kernel4.19 + arm kernel4.9 + arm64 kernel4.9 + arm Change-Id: Ie2549b1bddbc9fd819511a3c6d1b40c21561ccef Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
-rwxr-xr-xtee_core.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/tee_core.c b/tee_core.c
index 0dc456d..536654a 100755
--- a/tee_core.c
+++ b/tee_core.c
@@ -27,13 +27,6 @@
#define TEE_NUM_DEVICES 32
#define TEE_IOCTL_PARAM_SIZE(x) (sizeof(struct tee_param) * (x))
-
-#define u64_to_user_ptr(x) ( \
- { \
- typecheck(u64, x); \
- (void __user *)(uintptr_t)x; \
- } \
- )
/*
* Unprivileged devices in the lower half range and privileged devices in
* the upper half range.