mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/include/asm-generic/percpu.h
..
..
@@ -62,10 +62,6 @@
62
62
 #define PER_CPU_ATTRIBUTES
63
63
 #endif
64
64
 
65
-#ifndef PER_CPU_DEF_ATTRIBUTES
66
-#define PER_CPU_DEF_ATTRIBUTES
67
-#endif
68
-
69
65
 #define raw_cpu_generic_read(pcp)					\
70
66
 ({									\
71
67
 	*raw_cpu_ptr(&(pcp));						\
..
..
@@ -78,7 +74,7 @@
78
74
 
79
75
 #define raw_cpu_generic_add_return(pcp, val)				\
80
76
 ({									\
81
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
77
+	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\
82
78
 									\
83
79
 	*__p += val;							\
84
80
 	*__p;								\
..
..
@@ -86,7 +82,7 @@
86
82
 
87
83
 #define raw_cpu_generic_xchg(pcp, nval)					\
88
84
 ({									\
89
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
85
+	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\
90
86
 	typeof(pcp) __ret;						\
91
87
 	__ret = *__p;							\
92
88
 	*__p = nval;							\
..
..
@@ -95,7 +91,7 @@
95
91
 
96
92
 #define raw_cpu_generic_cmpxchg(pcp, oval, nval)			\
97
93
 ({									\
98
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
94
+	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\
99
95
 	typeof(pcp) __ret;						\
100
96
 	__ret = *__p;							\
101
97
 	if (__ret == (oval))						\
..
..
@@ -105,8 +101,8 @@
105
101
 
106
102
 #define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
107
103
 ({									\
108
-	typeof(&(pcp1)) __p1 = raw_cpu_ptr(&(pcp1));			\
109
-	typeof(&(pcp2)) __p2 = raw_cpu_ptr(&(pcp2));			\
104
+	typeof(pcp1) *__p1 = raw_cpu_ptr(&(pcp1));			\
105
+	typeof(pcp2) *__p2 = raw_cpu_ptr(&(pcp2));			\
110
106
 	int __ret = 0;							\
111
107
 	if (*__p1 == (oval1) && *__p2  == (oval2)) {			\
112
108
 		*__p1 = nval1;						\
..
..
@@ -118,21 +114,21 @@
118
114
 
119
115
 #define __this_cpu_generic_read_nopreempt(pcp)				\
120
116
 ({									\
121
-	typeof(pcp) __ret;						\
117
+	typeof(pcp) ___ret;						\
122
118
 	preempt_disable_notrace();					\
123
-	__ret = READ_ONCE(*raw_cpu_ptr(&(pcp)));			\
119
+	___ret = READ_ONCE(*raw_cpu_ptr(&(pcp)));			\
124
120
 	preempt_enable_notrace();					\
125
-	__ret;								\
121
+	___ret;								\
126
122
 })
127
123
 
128
124
 #define __this_cpu_generic_read_noirq(pcp)				\
129
125
 ({									\
130
-	typeof(pcp) __ret;						\
131
-	unsigned long __flags;						\
132
-	raw_local_irq_save(__flags);					\
133
-	__ret = raw_cpu_generic_read(pcp);				\
134
-	raw_local_irq_restore(__flags);					\
135
-	__ret;								\
126
+	typeof(pcp) ___ret;						\
127
+	unsigned long ___flags;						\
128
+	raw_local_irq_save(___flags);					\
129
+	___ret = raw_cpu_generic_read(pcp);				\
130
+	raw_local_irq_restore(___flags);				\
131
+	___ret;								\
136
132
 })
137
133
 
138
134
 #define this_cpu_generic_read(pcp)					\