hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/include/asm-generic/percpu.h
....@@ -62,10 +62,6 @@
6262 #define PER_CPU_ATTRIBUTES
6363 #endif
6464
65
-#ifndef PER_CPU_DEF_ATTRIBUTES
66
-#define PER_CPU_DEF_ATTRIBUTES
67
-#endif
68
-
6965 #define raw_cpu_generic_read(pcp) \
7066 ({ \
7167 *raw_cpu_ptr(&(pcp)); \
....@@ -78,7 +74,7 @@
7874
7975 #define raw_cpu_generic_add_return(pcp, val) \
8076 ({ \
81
- typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \
77
+ typeof(pcp) *__p = raw_cpu_ptr(&(pcp)); \
8278 \
8379 *__p += val; \
8480 *__p; \
....@@ -86,7 +82,7 @@
8682
8783 #define raw_cpu_generic_xchg(pcp, nval) \
8884 ({ \
89
- typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \
85
+ typeof(pcp) *__p = raw_cpu_ptr(&(pcp)); \
9086 typeof(pcp) __ret; \
9187 __ret = *__p; \
9288 *__p = nval; \
....@@ -95,7 +91,7 @@
9591
9692 #define raw_cpu_generic_cmpxchg(pcp, oval, nval) \
9793 ({ \
98
- typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \
94
+ typeof(pcp) *__p = raw_cpu_ptr(&(pcp)); \
9995 typeof(pcp) __ret; \
10096 __ret = *__p; \
10197 if (__ret == (oval)) \
....@@ -105,8 +101,8 @@
105101
106102 #define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
107103 ({ \
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)); \
110106 int __ret = 0; \
111107 if (*__p1 == (oval1) && *__p2 == (oval2)) { \
112108 *__p1 = nval1; \
....@@ -118,21 +114,21 @@
118114
119115 #define __this_cpu_generic_read_nopreempt(pcp) \
120116 ({ \
121
- typeof(pcp) __ret; \
117
+ typeof(pcp) ___ret; \
122118 preempt_disable_notrace(); \
123
- __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \
119
+ ___ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \
124120 preempt_enable_notrace(); \
125
- __ret; \
121
+ ___ret; \
126122 })
127123
128124 #define __this_cpu_generic_read_noirq(pcp) \
129125 ({ \
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; \
136132 })
137133
138134 #define this_cpu_generic_read(pcp) \