From: Liqiang Jin <liqiang.jin@amlogic.com>
Date: Mon, 10 Jun 2019 08:55:22 +0000 (+0800)
Subject: linuxdriver: update kernel4.9(4.9.113 -> 4.9.180) compile error [1/1]
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c054e1526f661f9d36232550809b5531473e943;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_optee.git

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>
---

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.