kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/mips/lib/bitops.c
..
..
@@ -7,6 +7,7 @@
7
7
  * Copyright (c) 1999, 2000  Silicon Graphics, Inc.
8
8
  */
9
9
 #include <linux/bitops.h>
10
+#include <linux/bits.h>
10
11
 #include <linux/irqflags.h>
11
12
 #include <linux/export.h>
12
13
 
..
..
@@ -19,12 +20,11 @@
19
20
  */
20
21
 void __mips_set_bit(unsigned long nr, volatile unsigned long *addr)
21
22
 {
22
-	unsigned long *a = (unsigned long *)addr;
23
-	unsigned bit = nr & SZLONG_MASK;
23
+	volatile unsigned long *a = &addr[BIT_WORD(nr)];
24
+	unsigned int bit = nr % BITS_PER_LONG;
24
25
 	unsigned long mask;
25
26
 	unsigned long flags;
26
27
 
27
-	a += nr >> SZLONG_LOG;
28
28
 	mask = 1UL << bit;
29
29
 	raw_local_irq_save(flags);
30
30
 	*a |= mask;
..
..
@@ -41,12 +41,11 @@
41
41
  */
42
42
 void __mips_clear_bit(unsigned long nr, volatile unsigned long *addr)
43
43
 {
44
-	unsigned long *a = (unsigned long *)addr;
45
-	unsigned bit = nr & SZLONG_MASK;
44
+	volatile unsigned long *a = &addr[BIT_WORD(nr)];
45
+	unsigned int bit = nr % BITS_PER_LONG;
46
46
 	unsigned long mask;
47
47
 	unsigned long flags;
48
48
 
49
-	a += nr >> SZLONG_LOG;
50
49
 	mask = 1UL << bit;
51
50
 	raw_local_irq_save(flags);
52
51
 	*a &= ~mask;
..
..
@@ -63,44 +62,17 @@
63
62
  */
64
63
 void __mips_change_bit(unsigned long nr, volatile unsigned long *addr)
65
64
 {
66
-	unsigned long *a = (unsigned long *)addr;
67
-	unsigned bit = nr & SZLONG_MASK;
65
+	volatile unsigned long *a = &addr[BIT_WORD(nr)];
66
+	unsigned int bit = nr % BITS_PER_LONG;
68
67
 	unsigned long mask;
69
68
 	unsigned long flags;
70
69
 
71
-	a += nr >> SZLONG_LOG;
72
70
 	mask = 1UL << bit;
73
71
 	raw_local_irq_save(flags);
74
72
 	*a ^= mask;
75
73
 	raw_local_irq_restore(flags);
76
74
 }
77
75
 EXPORT_SYMBOL(__mips_change_bit);
78
-
79
-
80
-/**
81
- * __mips_test_and_set_bit - Set a bit and return its old value.  This is
82
- * called by test_and_set_bit() if it cannot find a faster solution.
83
- * @nr: Bit to set
84
- * @addr: Address to count from
85
- */
86
-int __mips_test_and_set_bit(unsigned long nr,
87
-			    volatile unsigned long *addr)
88
-{
89
-	unsigned long *a = (unsigned long *)addr;
90
-	unsigned bit = nr & SZLONG_MASK;
91
-	unsigned long mask;
92
-	unsigned long flags;
93
-	int res;
94
-
95
-	a += nr >> SZLONG_LOG;
96
-	mask = 1UL << bit;
97
-	raw_local_irq_save(flags);
98
-	res = (mask & *a) != 0;
99
-	*a |= mask;
100
-	raw_local_irq_restore(flags);
101
-	return res;
102
-}
103
-EXPORT_SYMBOL(__mips_test_and_set_bit);
104
76
 
105
77
 
106
78
 /**
..
..
@@ -112,13 +84,12 @@
112
84
 int __mips_test_and_set_bit_lock(unsigned long nr,
113
85
 				 volatile unsigned long *addr)
114
86
 {
115
-	unsigned long *a = (unsigned long *)addr;
116
-	unsigned bit = nr & SZLONG_MASK;
87
+	volatile unsigned long *a = &addr[BIT_WORD(nr)];
88
+	unsigned int bit = nr % BITS_PER_LONG;
117
89
 	unsigned long mask;
118
90
 	unsigned long flags;
119
91
 	int res;
120
92
 
121
-	a += nr >> SZLONG_LOG;
122
93
 	mask = 1UL << bit;
123
94
 	raw_local_irq_save(flags);
124
95
 	res = (mask & *a) != 0;
..
..
@@ -137,13 +108,12 @@
137
108
  */
138
109
 int __mips_test_and_clear_bit(unsigned long nr, volatile unsigned long *addr)
139
110
 {
140
-	unsigned long *a = (unsigned long *)addr;
141
-	unsigned bit = nr & SZLONG_MASK;
111
+	volatile unsigned long *a = &addr[BIT_WORD(nr)];
112
+	unsigned int bit = nr % BITS_PER_LONG;
142
113
 	unsigned long mask;
143
114
 	unsigned long flags;
144
115
 	int res;
145
116
 
146
-	a += nr >> SZLONG_LOG;
147
117
 	mask = 1UL << bit;
148
118
 	raw_local_irq_save(flags);
149
119
 	res = (mask & *a) != 0;
..
..
@@ -162,13 +132,12 @@
162
132
  */
163
133
 int __mips_test_and_change_bit(unsigned long nr, volatile unsigned long *addr)
164
134
 {
165
-	unsigned long *a = (unsigned long *)addr;
166
-	unsigned bit = nr & SZLONG_MASK;
135
+	volatile unsigned long *a = &addr[BIT_WORD(nr)];
136
+	unsigned int bit = nr % BITS_PER_LONG;
167
137
 	unsigned long mask;
168
138
 	unsigned long flags;
169
139
 	int res;
170
140
 
171
-	a += nr >> SZLONG_LOG;
172
141
 	mask = 1UL << bit;
173
142
 	raw_local_irq_save(flags);
174
143
 	res = (mask & *a) != 0;