1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
|
diff -urp include.orig/asm-cris/arch-v10/byteorder.h include/asm-cris/arch-v10/byteorder.h
--- include.orig/asm-cris/arch-v10/byteorder.h 2003-10-15 11:13:31.000000000 -0400
+++ include/asm-cris/arch-v10/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -8,14 +8,14 @@
* them together into ntohl etc.
*/
-extern __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+extern __inline__ __u32 ___arch__swab32(__u32 x)
{
__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
return(x);
}
-extern __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+extern __inline__ __u16 ___arch__swab16(__u16 x)
{
__asm__ ("swapb %0" : "=r" (x) : "0" (x));
diff -urp include.orig/asm-i386/byteorder.h include/asm-i386/byteorder.h
--- include.orig/asm-i386/byteorder.h 2003-11-21 19:19:48.000000000 -0500
+++ include/asm-i386/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -10,7 +10,7 @@
#include <linux/config.h>
#endif
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
#ifdef CONFIG_X86_BSWAP
__asm__("bswap %0" : "=r" (x) : "0" (x));
@@ -26,7 +26,7 @@ static __inline__ __const__ __u32 ___arc
/* gcc should generate this for open coded C now too. May be worth switching to
it because inline assembly cannot be scheduled. -AK */
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
__asm__("xchgb %b0,%h0" /* swap bytes */
: "=q" (x)
diff -urp include.orig/asm-ia64/byteorder.h include/asm-ia64/byteorder.h
--- include.orig/asm-ia64/byteorder.h 2003-10-15 11:10:25.000000000 -0400
+++ include/asm-ia64/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -9,7 +9,7 @@
#include <asm/types.h>
#include <asm/intrinsics.h>
-static __inline__ __const__ __u64
+static __inline__ __u64
__ia64_swab64 (__u64 x)
{
__u64 result;
@@ -18,13 +18,13 @@ __ia64_swab64 (__u64 x)
return result;
}
-static __inline__ __const__ __u32
+static __inline__ __u32
__ia64_swab32 (__u32 x)
{
return __ia64_swab64(x) >> 32;
}
-static __inline__ __const__ __u16
+static __inline__ __u16
__ia64_swab16(__u16 x)
{
return __ia64_swab64(x) >> 48;
diff -urp include.orig/asm-m68k/byteorder.h include/asm-m68k/byteorder.h
--- include.orig/asm-m68k/byteorder.h 2003-10-15 11:12:08.000000000 -0400
+++ include/asm-m68k/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -5,7 +5,7 @@
#ifdef __GNUC__
-static __inline__ __const__ __u32 ___arch__swab32(__u32 val)
+static __inline__ __u32 ___arch__swab32(__u32 val)
{
__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
return val;
diff -urp include.orig/asm-parisc/byteorder.h include/asm-parisc/byteorder.h
--- include.orig/asm-parisc/byteorder.h 2003-10-15 11:14:12.000000000 -0400
+++ include/asm-parisc/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -5,7 +5,7 @@
#ifdef __GNUC__
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
__asm__("dep %0, 15, 8, %0\n\t" /* deposit 00ab -> 0bab */
"shd %%r0, %0, 8, %0" /* shift 000000ab -> 00ba */
@@ -14,7 +14,7 @@ static __inline__ __const__ __u16 ___arc
return x;
}
-static __inline__ __const__ __u32 ___arch__swab24(__u32 x)
+static __inline__ __u32 ___arch__swab24(__u32 x)
{
__asm__("shd %0, %0, 8, %0\n\t" /* shift xabcxabc -> cxab */
"dep %0, 15, 8, %0\n\t" /* deposit cxab -> cbab */
@@ -24,7 +24,7 @@ static __inline__ __const__ __u32 ___arc
return x;
}
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
unsigned int temp;
__asm__("shd %0, %0, 16, %1\n\t" /* shift abcdabcd -> cdab */
@@ -47,7 +47,7 @@ static __inline__ __const__ __u32 ___arc
** HSHR 67452301 -> *6*4*2*0 into %0
** OR %0 | %1 -> 76543210 into %0 (all done!)
*/
-static __inline__ __const__ __u64 ___arch__swab64(__u64 x) {
+static __inline__ __u64 ___arch__swab64(__u64 x) {
__u64 temp;
__asm__("permh,3210 %0, %0\n\t"
"hshl %0, 8, %1\n\t"
@@ -60,7 +60,7 @@ static __inline__ __const__ __u64 ___arc
#define __arch__swab64(x) ___arch__swab64(x)
#define __BYTEORDER_HAS_U64__
#elif !defined(__STRICT_ANSI__)
-static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
+static __inline__ __u64 ___arch__swab64(__u64 x)
{
__u32 t1 = ___arch__swab32((__u32) x);
__u32 t2 = ___arch__swab32((__u32) (x >> 32));
diff -urp include.orig/asm-ppc/byteorder.h include/asm-ppc/byteorder.h
--- include.orig/asm-ppc/byteorder.h 2003-10-15 11:12:10.000000000 -0400
+++ include/asm-ppc/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -32,7 +32,7 @@ extern __inline__ void st_le32(volatile
__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
}
-static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
+static __inline__ __u16 ___arch__swab16(__u16 value)
{
__u16 result;
@@ -40,7 +40,7 @@ static __inline__ __const__ __u16 ___arc
return result;
}
-static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
+static __inline__ __u32 ___arch__swab32(__u32 value)
{
__u32 result;
diff -urp include.orig/asm-ppc64/byteorder.h include/asm-ppc64/byteorder.h
--- include.orig/asm-ppc64/byteorder.h 2003-10-15 11:15:03.000000000 -0400
+++ include/asm-ppc64/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -40,7 +40,7 @@ static __inline__ void st_le32(volatile
}
#if 0
-static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
+static __inline__ __u16 ___arch__swab16(__u16 value)
{
__u16 result;
@@ -50,7 +50,7 @@ static __inline__ __const__ __u16 ___arc
return result;
}
-static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
+static __inline__ __u32 ___arch__swab32(__u32 value)
{
__u32 result;
@@ -62,7 +62,7 @@ static __inline__ __const__ __u32 ___arc
return result;
}
-static __inline__ __const__ __u64 ___arch__swab64(__u64 value)
+static __inline__ __u64 ___arch__swab64(__u64 value)
{
__u64 result;
#error implement me
diff -urp include.orig/asm-s390/byteorder.h include/asm-s390/byteorder.h
--- include.orig/asm-s390/byteorder.h 2003-10-15 11:15:04.000000000 -0400
+++ include/asm-s390/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -14,7 +14,7 @@
#ifdef __GNUC__
#ifdef __s390x__
-static __inline__ __const__ __u64 ___arch__swab64p(__u64 *x)
+static __inline__ __u64 ___arch__swab64p(__u64 *x)
{
__u64 result;
@@ -24,7 +24,7 @@ static __inline__ __const__ __u64 ___arc
return result;
}
-static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
+static __inline__ __u64 ___arch__swab64(__u64 x)
{
__u64 result;
@@ -40,7 +40,7 @@ static __inline__ void ___arch__swab64s(
}
#endif /* __s390x__ */
-static __inline__ __const__ __u32 ___arch__swab32p(__u32 *x)
+static __inline__ __u32 ___arch__swab32p(__u32 *x)
{
__u32 result;
@@ -58,7 +58,7 @@ static __inline__ __const__ __u32 ___arc
return result;
}
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
#ifndef __s390x__
return ___arch__swab32p(&x);
@@ -77,7 +77,7 @@ static __inline__ void ___arch__swab32s(
*x = ___arch__swab32p(x);
}
-static __inline__ __const__ __u16 ___arch__swab16p(__u16 *x)
+static __inline__ __u16 ___arch__swab16p(__u16 *x)
{
__u16 result;
@@ -93,7 +93,7 @@ static __inline__ __const__ __u16 ___arc
return result;
}
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
return ___arch__swab16p(&x);
}
diff -urp include.orig/asm-sh/byteorder.h include/asm-sh/byteorder.h
--- include.orig/asm-sh/byteorder.h 2003-10-15 11:09:47.000000000 -0400
+++ include/asm-sh/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -7,7 +7,7 @@
#include <asm/types.h>
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
__asm__("swap.b %0, %0\n\t"
"swap.w %0, %0\n\t"
@@ -17,7 +17,7 @@ static __inline__ __const__ __u32 ___arc
return x;
}
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
__asm__("swap.b %0, %0"
: "=r" (x)
diff -urp include.orig/asm-v850/byteorder.h include/asm-v850/byteorder.h
--- include.orig/asm-v850/byteorder.h 2003-10-15 11:14:03.000000000 -0400
+++ include/asm-v850/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -18,14 +18,14 @@
#ifdef __GNUC__
-static __inline__ __const__ __u32 ___arch__swab32 (__u32 word)
+static __inline__ __u32 ___arch__swab32 (__u32 word)
{
__u32 res;
__asm__ ("bsw %1, %0" : "=r" (res) : "r" (word));
return res;
}
-static __inline__ __const__ __u16 ___arch__swab16 (__u16 half_word)
+static __inline__ __u16 ___arch__swab16 (__u16 half_word)
{
__u16 res;
__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
diff -urp include.orig/asm-x86_64/byteorder.h include/asm-x86_64/byteorder.h
--- include.orig/asm-x86_64/byteorder.h 2003-10-15 11:13:30.000000000 -0400
+++ include/asm-x86_64/byteorder.h 2003-11-21 19:27:07.000000000 -0500
@@ -5,13 +5,13 @@
#ifdef __GNUC__
-static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
+static __inline__ __u64 ___arch__swab64(__u64 x)
{
__asm__("bswapq %0" : "=r" (x) : "0" (x));
return x;
}
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
__asm__("bswapl %0" : "=r" (x) : "0" (x));
return x;
diff -urp include.orig/linux/byteorder/swab.h include/linux/byteorder/swab.h
--- include.orig/linux/byteorder/swab.h 2003-10-15 11:15:04.000000000 -0400
+++ include/linux/byteorder/swab.h 2003-11-21 19:27:07.000000000 -0500
@@ -128,7 +128,7 @@
#endif /* OPTIMIZE */
-static __inline__ __const__ __u16 __fswab16(__u16 x)
+static __inline__ __u16 __fswab16(__u16 x)
{
return __arch__swab16(x);
}
@@ -141,7 +141,7 @@ static __inline__ void __swab16s(__u16 *
__arch__swab16s(addr);
}
-static __inline__ __const__ __u32 __fswab32(__u32 x)
+static __inline__ __u32 __fswab32(__u32 x)
{
return __arch__swab32(x);
}
@@ -155,7 +155,7 @@ static __inline__ void __swab32s(__u32 *
}
#ifdef __BYTEORDER_HAS_U64__
-static __inline__ __const__ __u64 __fswab64(__u64 x)
+static __inline__ __u64 __fswab64(__u64 x)
{
# ifdef __SWAB_64_THRU_32__
__u32 h = x >> 32;
diff -urp include.orig/linux/byteorder/swabb.h include/linux/byteorder/swabb.h
--- include.orig/linux/byteorder/swabb.h 2003-10-15 11:11:22.000000000 -0400
+++ include/linux/byteorder/swabb.h 2003-11-21 19:27:07.000000000 -0500
@@ -92,7 +92,7 @@
#endif /* OPTIMIZE */
-static __inline__ __const__ __u32 __fswahw32(__u32 x)
+static __inline__ __u32 __fswahw32(__u32 x)
{
return __arch__swahw32(x);
}
@@ -106,7 +106,7 @@ static __inline__ void __swahw32s(__u32
}
-static __inline__ __const__ __u32 __fswahb32(__u32 x)
+static __inline__ __u32 __fswahb32(__u32 x)
{
return __arch__swahb32(x);
}
|
