AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/arch/powerpc/include/asm/cmpxchg.h
..
..
@@ -6,7 +6,6 @@
6
6
 #include <linux/compiler.h>
7
7
 #include <asm/synch.h>
8
8
 #include <linux/bug.h>
9
-#include <asm/asm-405.h>
10
9
 
11
10
 #ifdef __BIG_ENDIAN
12
11
 #define BITOFF_CAL(size, off)	((sizeof(u32) - size - off) * BITS_PER_BYTE)
..
..
@@ -29,7 +28,6 @@
29
28
 "1:	lwarx   %0,0,%3\n"					\
30
29
 "	andc	%1,%0,%5\n"					\
31
30
 "	or	%1,%1,%4\n"					\
32
-	PPC405_ERR77(0,%3)					\
33
31
 "	stwcx.	%1,0,%3\n"					\
34
32
 "	bne-	1b\n"						\
35
33
 	: "=&r" (prev), "=&r" (tmp), "+m" (*(u32*)p)		\
..
..
@@ -60,7 +58,6 @@
60
58
 "	bne-	2f\n"						\
61
59
 "	andc	%1,%0,%6\n"					\
62
60
 "	or	%1,%1,%5\n"					\
63
-	PPC405_ERR77(0,%3)					\
64
61
 "	stwcx.  %1,0,%3\n"					\
65
62
 "	bne-    1b\n"						\
66
63
 	br2							\
..
..
@@ -92,7 +89,6 @@
92
89
 
93
90
 	__asm__ __volatile__(
94
91
 "1:	lwarx	%0,0,%2 \n"
95
-	PPC405_ERR77(0,%2)
96
92
 "	stwcx.	%3,0,%2 \n\
97
93
 	bne-	1b"
98
94
 	: "=&r" (prev), "+m" (*(volatile unsigned int *)p)
..
..
@@ -109,7 +105,6 @@
109
105
 
110
106
 	__asm__ __volatile__(
111
107
 "1:	lwarx	%0,0,%2\n"
112
-	PPC405_ERR77(0, %2)
113
108
 "	stwcx.	%3,0,%2\n"
114
109
 "	bne-	1b"
115
110
 	: "=&r" (prev), "+m" (*p)
..
..
@@ -127,7 +122,6 @@
127
122
 
128
123
 	__asm__ __volatile__(
129
124
 "1:	ldarx	%0,0,%2 \n"
130
-	PPC405_ERR77(0,%2)
131
125
 "	stdcx.	%3,0,%2 \n\
132
126
 	bne-	1b"
133
127
 	: "=&r" (prev), "+m" (*(volatile unsigned long *)p)
..
..
@@ -144,7 +138,6 @@
144
138
 
145
139
 	__asm__ __volatile__(
146
140
 "1:	ldarx	%0,0,%2\n"
147
-	PPC405_ERR77(0, %2)
148
141
 "	stdcx.	%3,0,%2\n"
149
142
 "	bne-	1b"
150
143
 	: "=&r" (prev), "+m" (*p)
..
..
@@ -229,7 +222,6 @@
229
222
 "1:	lwarx	%0,0,%2		# __cmpxchg_u32\n\
230
223
 	cmpw	0,%0,%3\n\
231
224
 	bne-	2f\n"
232
-	PPC405_ERR77(0,%2)
233
225
 "	stwcx.	%4,0,%2\n\
234
226
 	bne-	1b"
235
227
 	PPC_ATOMIC_EXIT_BARRIER
..
..
@@ -252,7 +244,6 @@
252
244
 "1:	lwarx	%0,0,%2		# __cmpxchg_u32\n\
253
245
 	cmpw	0,%0,%3\n\
254
246
 	bne-	2f\n"
255
-	PPC405_ERR77(0,%2)
256
247
 "	stwcx.	%4,0,%2\n\
257
248
 	bne-	1b"
258
249
 	"\n\
..
..
@@ -273,7 +264,6 @@
273
264
 "1:	lwarx	%0,0,%2		# __cmpxchg_u32_relaxed\n"
274
265
 "	cmpw	0,%0,%3\n"
275
266
 "	bne-	2f\n"
276
-	PPC405_ERR77(0, %2)
277
267
 "	stwcx.	%4,0,%2\n"
278
268
 "	bne-	1b\n"
279
269
 "2:"
..
..
@@ -301,7 +291,6 @@
301
291
 "1:	lwarx	%0,0,%2		# __cmpxchg_u32_acquire\n"
302
292
 "	cmpw	0,%0,%3\n"
303
293
 "	bne-	2f\n"
304
-	PPC405_ERR77(0, %2)
305
294
 "	stwcx.	%4,0,%2\n"
306
295
 "	bne-	1b\n"
307
296
 	PPC_ACQUIRE_BARRIER