1 From 7fef6b983456e4c529a5239ea90715050e6f4452 Mon Sep 17 00:00:00 2001
2 From: Chris Packham <chris.packham@alliedtelesis.co.nz>
3 Date: Mon, 1 Oct 2012 18:12:54 +1300
4 Subject: [PATCH 4/8] libc/sysdeps: add __kernel_long and __kernel_ulong
6 Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
7 exported header files were updated to use these new types. Add the
8 definitions for __kernel_long_t and __kernel_ulong_t to the relevant
9 kernel_types.h headers.
11 This change was automated with the following scriptlet
13 git grep --name-only 'typedef.*__kernel_old_dev_t' \
14 | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
15 typedef long\t\t__kernel_long_t;\
16 typedef unsigned long\t__kernel_ulong_t;'
18 Whitespace in arm, hppa, sparc was then manually fixed up.
20 Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
21 [yann.morin.1998@free.fr: remove avr32 bits, now Buildroot no longer
23 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
25 Here's a cleaned up patch which should get the whitespace right. I'm a
26 bit iffy about the sparc changes they make sense to me but it's not a
27 platform I have access to.
29 I can break this up per arch or per maintainer if requested.
31 libc/sysdeps/linux/alpha/bits/kernel_types.h | 2 ++
32 libc/sysdeps/linux/arm/bits/kernel_types.h | 2 ++
33 libc/sysdeps/linux/bfin/bits/kernel_types.h | 2 ++
34 libc/sysdeps/linux/c6x/bits/kernel_types.h | 2 ++
35 libc/sysdeps/linux/cris/bits/kernel_types.h | 2 ++
36 libc/sysdeps/linux/e1/bits/kernel_types.h | 2 ++
37 libc/sysdeps/linux/h8300/bits/kernel_types.h | 2 ++
38 libc/sysdeps/linux/hppa/bits/kernel_types.h | 2 ++
39 libc/sysdeps/linux/i386/bits/kernel_types.h | 2 ++
40 libc/sysdeps/linux/ia64/bits/kernel_types.h | 2 ++
41 libc/sysdeps/linux/m68k/bits/kernel_types.h | 2 ++
42 libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
43 libc/sysdeps/linux/mips/bits/kernel_types.h | 4 ++++
44 libc/sysdeps/linux/nios2/bits/kernel_types.h | 2 ++
45 libc/sysdeps/linux/powerpc/bits/kernel_types.h | 4 ++++
46 libc/sysdeps/linux/sh/bits/kernel_types.h | 2 ++
47 libc/sysdeps/linux/sh64/bits/kernel_types.h | 2 ++
48 libc/sysdeps/linux/sparc/bits/kernel_types.h | 4 ++++
49 libc/sysdeps/linux/v850/bits/kernel_types.h | 2 ++
50 libc/sysdeps/linux/x86_64/bits/kernel_types.h | 2 ++
51 libc/sysdeps/linux/xtensa/bits/kernel_types.h | 2 ++
52 22 files changed, 50 insertions(+)
53 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
54 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
55 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
57 libc/sysdeps/linux/alpha/bits/kernel_types.h | 2 ++
58 libc/sysdeps/linux/arm/bits/kernel_types.h | 2 ++
59 libc/sysdeps/linux/bfin/bits/kernel_types.h | 2 ++
60 libc/sysdeps/linux/c6x/bits/kernel_types.h | 2 ++
61 libc/sysdeps/linux/cris/bits/kernel_types.h | 2 ++
62 libc/sysdeps/linux/e1/bits/kernel_types.h | 2 ++
63 libc/sysdeps/linux/h8300/bits/kernel_types.h | 2 ++
64 libc/sysdeps/linux/hppa/bits/kernel_types.h | 2 ++
65 libc/sysdeps/linux/i386/bits/kernel_types.h | 2 ++
66 libc/sysdeps/linux/ia64/bits/kernel_types.h | 2 ++
67 libc/sysdeps/linux/m68k/bits/kernel_types.h | 2 ++
68 libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
69 libc/sysdeps/linux/mips/bits/kernel_types.h | 4 ++++
70 libc/sysdeps/linux/nios2/bits/kernel_types.h | 2 ++
71 libc/sysdeps/linux/powerpc/bits/kernel_types.h | 4 ++++
72 libc/sysdeps/linux/sh/bits/kernel_types.h | 2 ++
73 libc/sysdeps/linux/sh64/bits/kernel_types.h | 2 ++
74 libc/sysdeps/linux/sparc/bits/kernel_types.h | 4 ++++
75 libc/sysdeps/linux/v850/bits/kernel_types.h | 2 ++
76 libc/sysdeps/linux/x86_64/bits/kernel_types.h | 2 ++
77 libc/sysdeps/linux/xtensa/bits/kernel_types.h | 2 ++
78 22 files changed, 50 insertions(+)
80 diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
81 index d5574c9..cd59b9d 100644
82 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
83 +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
84 @@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
85 typedef __kernel_uid_t __kernel_uid32_t;
86 typedef __kernel_gid_t __kernel_gid32_t;
87 typedef __kernel_dev_t __kernel_old_dev_t;
88 +typedef long __kernel_long_t;
89 +typedef unsigned long __kernel_ulong_t;
93 diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
94 index 766a306..6b36f32 100644
95 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h
96 +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
97 @@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
98 typedef unsigned short __kernel_old_gid_t;
99 typedef long long __kernel_loff_t;
100 typedef __kernel_dev_t __kernel_old_dev_t;
101 +typedef long __kernel_long_t;
102 +typedef unsigned long __kernel_ulong_t;
106 diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
107 index d69a875..9fec595 100644
108 --- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
109 +++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
110 @@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
111 typedef unsigned short __kernel_old_gid_t;
112 typedef long long __kernel_loff_t;
113 typedef __kernel_dev_t __kernel_old_dev_t;
114 +typedef long __kernel_long_t;
115 +typedef unsigned long __kernel_ulong_t;
119 diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
120 index 7557309..2c363a8 100644
121 --- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
122 +++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
123 @@ -22,6 +22,8 @@ typedef unsigned int __kernel_gid32_t;
124 typedef unsigned int __kernel_old_uid_t;
125 typedef unsigned int __kernel_old_gid_t;
126 typedef unsigned int __kernel_old_dev_t;
127 +typedef long __kernel_long_t;
128 +typedef unsigned long __kernel_ulong_t;
129 typedef unsigned int __kernel_size_t;
130 typedef int __kernel_ssize_t;
131 typedef int __kernel_ptrdiff_t;
132 diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
133 index f122c7f..5d31f7b 100644
134 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h
135 +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
136 @@ -28,6 +28,8 @@ typedef unsigned int __kernel_gid32_t;
137 typedef unsigned short __kernel_old_uid_t;
138 typedef unsigned short __kernel_old_gid_t;
139 typedef __kernel_dev_t __kernel_old_dev_t;
140 +typedef long __kernel_long_t;
141 +typedef unsigned long __kernel_ulong_t;
144 typedef long long __kernel_loff_t;
145 diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
146 index 8017d85..f55a129 100644
147 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h
148 +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
149 @@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
150 typedef unsigned short __kernel_old_uid_t;
151 typedef unsigned short __kernel_old_gid_t;
152 typedef __kernel_dev_t __kernel_old_dev_t;
153 +typedef long __kernel_long_t;
154 +typedef unsigned long __kernel_ulong_t;
155 typedef long long __kernel_loff_t;
158 diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
159 index 0570675..4cfd1bf 100644
160 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
161 +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
162 @@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
163 typedef unsigned short __kernel_old_gid_t;
164 typedef long long __kernel_loff_t;
165 typedef __kernel_dev_t __kernel_old_dev_t;
166 +typedef long __kernel_long_t;
167 +typedef unsigned long __kernel_ulong_t;
171 diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
172 index 4441f9b..6b2e794 100644
173 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
174 +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
175 @@ -45,6 +45,8 @@ typedef long long __kernel_off64_t;
176 typedef unsigned long long __kernel_ino64_t;
178 typedef unsigned int __kernel_old_dev_t;
179 +typedef long __kernel_long_t;
180 +typedef unsigned long __kernel_ulong_t;
184 diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
185 index 9c07c72..59044b8 100644
186 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
187 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
188 @@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
189 typedef unsigned short __kernel_old_uid_t;
190 typedef unsigned short __kernel_old_gid_t;
191 typedef __kernel_dev_t __kernel_old_dev_t;
192 +typedef long __kernel_long_t;
193 +typedef unsigned long __kernel_ulong_t;
194 typedef long long __kernel_loff_t;
197 diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
198 index c8ef86d..e31dc65 100644
199 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
200 +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
201 @@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
203 typedef unsigned int __kernel_dev_t;
204 typedef unsigned int __kernel_old_dev_t;
205 +typedef long __kernel_long_t;
206 +typedef unsigned long __kernel_ulong_t;
208 #endif /* _ASM_IA64_POSIX_TYPES_H */
209 diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
210 index 0a77a8f..176b968 100644
211 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
212 +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
213 @@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t;
214 typedef unsigned short __kernel_old_gid_t;
215 typedef long long __kernel_loff_t;
216 typedef __kernel_dev_t __kernel_old_dev_t;
217 +typedef long __kernel_long_t;
218 +typedef unsigned long __kernel_ulong_t;
222 diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
223 index 2a70575..a9f736b 100644
224 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
225 +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
226 @@ -44,6 +44,8 @@ typedef unsigned int __kernel_gid32_t;
227 typedef unsigned int __kernel_old_uid_t;
228 typedef unsigned int __kernel_old_gid_t;
229 typedef unsigned int __kernel_old_dev_t;
230 +typedef long __kernel_long_t;
231 +typedef unsigned long __kernel_ulong_t;
234 typedef long long __kernel_loff_t;
235 diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
236 index 9fc3b96..97faeac 100644
237 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h
238 +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
239 @@ -32,6 +32,8 @@ typedef int __kernel_gid32_t;
240 typedef __kernel_uid_t __kernel_old_uid_t;
241 typedef __kernel_gid_t __kernel_old_gid_t;
242 typedef __kernel_dev_t __kernel_old_dev_t;
243 +typedef long __kernel_long_t;
244 +typedef unsigned long __kernel_ulong_t;
245 typedef long long __kernel_loff_t;
247 typedef unsigned int __kernel_dev_t;
248 @@ -68,6 +70,8 @@ typedef int __kernel_gid32_t;
249 typedef __kernel_uid_t __kernel_old_uid_t;
250 typedef __kernel_gid_t __kernel_old_gid_t;
251 typedef __kernel_dev_t __kernel_old_dev_t;
252 +typedef long __kernel_long_t;
253 +typedef unsigned long __kernel_ulong_t;
254 typedef long long __kernel_loff_t;
257 diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
258 index 8b86d79..3c030e7 100644
259 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
260 +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
261 @@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
262 typedef unsigned short __kernel_old_uid_t;
263 typedef unsigned short __kernel_old_gid_t;
264 typedef unsigned short __kernel_old_dev_t;
265 +typedef long __kernel_long_t;
266 +typedef unsigned long __kernel_ulong_t;
267 typedef long long __kernel_loff_t;
270 diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
271 index 3f3b933..1167de2 100644
272 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
273 +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
274 @@ -36,6 +36,8 @@ typedef unsigned int __kernel_gid32_t;
275 typedef unsigned int __kernel_old_uid_t;
276 typedef unsigned int __kernel_old_gid_t;
277 typedef __kernel_dev_t __kernel_old_dev_t;
278 +typedef long __kernel_long_t;
279 +typedef unsigned long __kernel_ulong_t;
281 typedef unsigned int __kernel_dev_t;
282 typedef unsigned int __kernel_ino_t;
283 @@ -61,6 +63,8 @@ typedef unsigned int __kernel_gid32_t;
284 typedef unsigned int __kernel_old_uid_t;
285 typedef unsigned int __kernel_old_gid_t;
286 typedef __kernel_dev_t __kernel_old_dev_t;
287 +typedef long __kernel_long_t;
288 +typedef unsigned long __kernel_ulong_t;
289 typedef long long __kernel_loff_t;
292 diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
293 index f96e9fa..ac97261 100644
294 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h
295 +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
296 @@ -32,6 +32,8 @@ typedef unsigned int __kernel_gid32_t;
297 typedef unsigned short __kernel_old_uid_t;
298 typedef unsigned short __kernel_old_gid_t;
299 typedef __kernel_dev_t __kernel_old_dev_t;
300 +typedef long __kernel_long_t;
301 +typedef unsigned long __kernel_ulong_t;
302 typedef long long __kernel_loff_t;
305 diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
306 index 671cc83..8cc6c61 100644
307 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
308 +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
309 @@ -43,6 +43,8 @@ typedef unsigned int __kernel_gid32_t;
310 typedef unsigned short __kernel_old_uid_t;
311 typedef unsigned short __kernel_old_gid_t;
312 typedef __kernel_dev_t __kernel_old_dev_t;
313 +typedef long __kernel_long_t;
314 +typedef unsigned long __kernel_ulong_t;
315 typedef long long __kernel_loff_t;
318 diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
319 index 0cc4bc2..a10e075 100644
320 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
321 +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
322 @@ -32,6 +32,8 @@ typedef unsigned short __kernel_gid16_t;
323 typedef __kernel_uid_t __kernel_old_uid_t;
324 typedef __kernel_gid_t __kernel_old_gid_t;
325 typedef __kernel_dev_t __kernel_old_dev_t;
326 +typedef long __kernel_long_t;
327 +typedef unsigned long __kernel_ulong_t;
328 typedef __kernel_uid_t __kernel_uid32_t;
329 typedef __kernel_gid_t __kernel_gid32_t;
330 typedef int __kernel_suseconds_t;
331 @@ -62,6 +64,8 @@ typedef unsigned int __kernel_gid32_t;
332 typedef unsigned short __kernel_old_uid_t;
333 typedef unsigned short __kernel_old_gid_t;
334 typedef __kernel_dev_t __kernel_old_dev_t;
335 +typedef long __kernel_long_t;
336 +typedef unsigned long __kernel_ulong_t;
337 typedef long long __kernel_loff_t;
340 diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
341 index 3e851ab..780aa8a 100644
342 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h
343 +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
344 @@ -41,6 +41,8 @@ typedef unsigned int __kernel_gid32_t;
345 typedef unsigned short __kernel_old_uid_t;
346 typedef unsigned short __kernel_old_gid_t;
347 typedef __kernel_dev_t __kernel_old_dev_t;
348 +typedef long __kernel_long_t;
349 +typedef unsigned long __kernel_ulong_t;
353 diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
354 index de800d7..0cae08c 100644
355 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
356 +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
357 @@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
358 typedef unsigned short __kernel_old_uid_t;
359 typedef unsigned short __kernel_old_gid_t;
360 typedef __kernel_dev_t __kernel_old_dev_t;
361 +typedef long __kernel_long_t;
362 +typedef unsigned long __kernel_ulong_t;
363 typedef long long __kernel_loff_t;
366 diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
367 index 44f1075..ed38f2e 100644
368 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
369 +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
370 @@ -33,6 +33,8 @@ typedef unsigned int __kernel_gid32_t;
371 typedef unsigned short __kernel_old_uid_t;
372 typedef unsigned short __kernel_old_gid_t;
373 typedef unsigned short __kernel_old_dev_t;
374 +typedef long __kernel_long_t;
375 +typedef unsigned long __kernel_ulong_t;
376 typedef long long __kernel_loff_t;
378 /* Beginning in 2.6 kernels, which is the first version that includes the