linuxdriver: update kernel4.9(4.9.113 -> 4.9.180) compile error [1/1]
authorLiqiang Jin <liqiang.jin@amlogic.com>
Mon, 10 Jun 2019 08:55:22 +0000 (16:55 +0800)
committerliqiang jin <liqiang.jin@amlogic.com>
Mon, 10 Jun 2019 10:44:19 +0000 (03:44 -0700)
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>
tee_core.c

index 0dc456de57c3194b70ea57ae2887f3a6e7308062..536654ac653aa35377ab88dd0d0d7855bf63c08d 100755 (executable)
 #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.