AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/arch/nds32/include/asm/uaccess.h
..
..
@@ -1,4 +1,4 @@
1
-// SPDX-License-Identifier: GPL-2.0
1
+/* SPDX-License-Identifier: GPL-2.0 */
2
2
 // Copyright (C) 2005-2017 Andes Technology Corporation
3
3
 
4
4
 #ifndef _ASMANDES_UACCESS_H
..
..
@@ -11,10 +11,6 @@
11
11
 #include <asm/errno.h>
12
12
 #include <asm/memory.h>
13
13
 #include <asm/types.h>
14
-#include <linux/mm.h>
15
-
16
-#define VERIFY_READ	0
17
-#define VERIFY_WRITE	1
18
14
 
19
15
 #define __asmeq(x, y)  ".ifnc " x "," y " ; .err ; .endif\n\t"
20
16
 
..
..
@@ -40,7 +36,6 @@
40
36
 #define KERNEL_DS 	((mm_segment_t) { ~0UL })
41
37
 #define USER_DS		((mm_segment_t) {TASK_SIZE - 1})
42
38
 
43
-#define get_ds()	(KERNEL_DS)
44
39
 #define get_fs()	(current_thread_info()->addr_limit)
45
40
 #define user_addr_max	get_fs
46
41
 
..
..
@@ -49,11 +44,11 @@
49
44
 	current_thread_info()->addr_limit = fs;
50
45
 }
51
46
 
52
-#define segment_eq(a, b)	((a) == (b))
47
+#define uaccess_kernel()	(get_fs() == KERNEL_DS)
53
48
 
54
49
 #define __range_ok(addr, size) (size <= get_fs() && addr <= (get_fs() -size))
55
50
 
56
-#define access_ok(type, addr, size)	\
51
+#define access_ok(addr, size)	\
57
52
 	__range_ok((unsigned long)addr, (unsigned long)size)
58
53
 /*
59
54
  * Single-value transfer routines.  They automatically use the right
..
..
@@ -75,9 +70,7 @@
75
70
  * versions are void (ie, don't return a value as such).
76
71
  */
77
72
 
78
-#define get_user	__get_user					\
79
-
80
-#define __get_user(x, ptr)						\
73
+#define get_user(x, ptr)						\
81
74
 ({									\
82
75
 	long __gu_err = 0;						\
83
76
 	__get_user_check((x), (ptr), __gu_err);				\
..
..
@@ -90,11 +83,19 @@
90
83
 	(void)0;							\
91
84
 })
92
85
 
86
+#define __get_user(x, ptr)						\
87
+({									\
88
+	long __gu_err = 0;						\
89
+	const __typeof__(*(ptr)) __user *__p = (ptr);			\
90
+	__get_user_err((x), __p, (__gu_err));				\
91
+	__gu_err;							\
92
+})
93
+
93
94
 #define __get_user_check(x, ptr, err)					\
94
95
 ({									\
95
96
 	const __typeof__(*(ptr)) __user *__p = (ptr);			\
96
97
 	might_fault();							\
97
-	if (access_ok(VERIFY_READ, __p, sizeof(*__p))) {		\
98
+	if (access_ok(__p, sizeof(*__p))) {		\
98
99
 		__get_user_err((x), __p, (err));			\
99
100
 	} else {							\
100
101
 		(x) = 0; (err) = -EFAULT;				\
..
..
@@ -170,12 +171,18 @@
170
171
 		: "r"(addr), "i"(-EFAULT)				\
171
172
 		: "cc")
172
173
 
173
-#define put_user	__put_user					\
174
+#define put_user(x, ptr)						\
175
+({									\
176
+	long __pu_err = 0;						\
177
+	__put_user_check((x), (ptr), __pu_err);				\
178
+	__pu_err;							\
179
+})
174
180
 
175
181
 #define __put_user(x, ptr)						\
176
182
 ({									\
177
183
 	long __pu_err = 0;						\
178
-	__put_user_err((x), (ptr), __pu_err);				\
184
+	__typeof__(*(ptr)) __user *__p = (ptr);				\
185
+	__put_user_err((x), __p, __pu_err);				\
179
186
 	__pu_err;							\
180
187
 })
181
188
 
..
..
@@ -189,7 +196,7 @@
189
196
 ({									\
190
197
 	__typeof__(*(ptr)) __user *__p = (ptr);				\
191
198
 	might_fault();							\
192
-	if (access_ok(VERIFY_WRITE, __p, sizeof(*__p))) {		\
199
+	if (access_ok(__p, sizeof(*__p))) {		\
193
200
 		__put_user_err((x), __p, (err));			\
194
201
 	} else	{							\
195
202
 		(err) = -EFAULT;					\
..
..
@@ -279,7 +286,7 @@
279
286
 #define INLINE_COPY_TO_USER
280
287
 static inline unsigned long clear_user(void __user * to, unsigned long n)
281
288
 {
282
-	if (access_ok(VERIFY_WRITE, to, n))
289
+	if (access_ok(to, n))
283
290
 		n = __arch_clear_user(to, n);
284
291
 	return n;
285
292
 }