1 |
vapier 08/04/20 03:22:54 |
2 |
|
3 |
Added: 03_all_linux-export-aligned-64bits.patch |
4 |
05_all_no-glibc-ifdefs.patch |
5 |
07_all_pull-libc-headers-asm.patch |
6 |
07_all_pull-libc-headers-linux.patch |
7 |
09_all_include-other-linux-headers.patch |
8 |
Log: |
9 |
initial 2.6.25 patchset based on last 2.6.24 patchset |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 src/patchsets/gentoo-headers/2.6.25/03_all_linux-export-aligned-64bits.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/03_all_linux-export-aligned-64bits.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/03_all_linux-export-aligned-64bits.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: 03_all_linux-export-aligned-64bits.patch |
18 |
=================================================================== |
19 |
http://bugs.gentoo.org/204448 |
20 |
|
21 |
some headers rely on these aligned_* macros and they dont conflict with normal |
22 |
userspace / libc types, so always export them regardless of the define |
23 |
__KERNEL_STRICT_NAMES |
24 |
|
25 |
--- include/linux/types.h |
26 |
+++ include/linux/types.h |
27 |
@@ -125,11 +125,6 @@ |
28 |
typedef __s64 int64_t; |
29 |
#endif |
30 |
|
31 |
-/* this is a special 64bit data type that is 8-byte aligned */ |
32 |
-#define aligned_u64 __u64 __attribute__((aligned(8))) |
33 |
-#define aligned_be64 __be64 __attribute__((aligned(8))) |
34 |
-#define aligned_le64 __le64 __attribute__((aligned(8))) |
35 |
- |
36 |
/** |
37 |
* The type used for indexing onto a disc or disc partition. |
38 |
* |
39 |
@@ -161,6 +156,11 @@ |
40 |
|
41 |
#endif /* __KERNEL_STRICT_NAMES */ |
42 |
|
43 |
+/* this is a special 64bit data type that is 8-byte aligned */ |
44 |
+#define aligned_u64 __u64 __attribute__((aligned(8))) |
45 |
+#define aligned_be64 __be64 __attribute__((aligned(8))) |
46 |
+#define aligned_le64 __le64 __attribute__((aligned(8))) |
47 |
+ |
48 |
/* |
49 |
* Below are truly Linux-specific types that should never collide with |
50 |
* any application/library that wants linux/types.h. |
51 |
|
52 |
|
53 |
|
54 |
1.1 src/patchsets/gentoo-headers/2.6.25/05_all_no-glibc-ifdefs.patch |
55 |
|
56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/05_all_no-glibc-ifdefs.patch?rev=1.1&view=markup |
57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/05_all_no-glibc-ifdefs.patch?rev=1.1&content-type=text/plain |
58 |
|
59 |
Index: 05_all_no-glibc-ifdefs.patch |
60 |
=================================================================== |
61 |
only check KERNEL so we dont assume libc == glibc |
62 |
|
63 |
--- a/include/linux/socket.h |
64 |
+++ b/include/linux/socket.h |
65 |
@@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage { |
66 |
/* _SS_MAXSIZE value minus size of ss_family */ |
67 |
} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ |
68 |
|
69 |
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) |
70 |
+#ifdef __KERNEL__ |
71 |
|
72 |
#include <asm/socket.h> /* arch-dependent defines */ |
73 |
#include <linux/sockios.h> /* the SIOCxxx I/O controls */ |
74 |
--- a/include/linux/stat.h |
75 |
+++ b/include/linux/stat.h |
76 |
@@ -7,7 +7,7 @@ |
77 |
|
78 |
#endif |
79 |
|
80 |
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) |
81 |
+#ifdef __KERNEL__ |
82 |
|
83 |
#define S_IFMT 00170000 |
84 |
#define S_IFSOCK 0140000 |
85 |
|
86 |
|
87 |
|
88 |
1.1 src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-asm.patch |
89 |
|
90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-asm.patch?rev=1.1&view=markup |
91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-asm.patch?rev=1.1&content-type=text/plain |
92 |
|
93 |
Index: 07_all_pull-libc-headers-asm.patch |
94 |
=================================================================== |
95 |
pull in the libc versions of these headers so that the proper |
96 |
userspace defines/typedefs are utilized |
97 |
|
98 |
--- a/include/asm-generic/siginfo.h |
99 |
+++ b/include/asm-generic/siginfo.h |
100 |
@@ -1,6 +1,10 @@ |
101 |
#ifndef _ASM_GENERIC_SIGINFO_H |
102 |
#define _ASM_GENERIC_SIGINFO_H |
103 |
|
104 |
+#ifndef __KERNEL__ |
105 |
+# include <signal.h> |
106 |
+#else |
107 |
+ |
108 |
#include <linux/compiler.h> |
109 |
#include <linux/types.h> |
110 |
|
111 |
@@ -267,7 +271,6 @@ typedef struct sigevent { |
112 |
#define sigev_notify_attributes _sigev_un._sigev_thread._attribute |
113 |
#define sigev_notify_thread_id _sigev_un._tid |
114 |
|
115 |
-#ifdef __KERNEL__ |
116 |
|
117 |
struct siginfo; |
118 |
void do_schedule_next_timer(struct siginfo *info); |
119 |
|
120 |
|
121 |
|
122 |
1.1 src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch |
123 |
|
124 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch?rev=1.1&view=markup |
125 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/07_all_pull-libc-headers-linux.patch?rev=1.1&content-type=text/plain |
126 |
|
127 |
Index: 07_all_pull-libc-headers-linux.patch |
128 |
=================================================================== |
129 |
pull in the libc versions of these headers so that the proper userspace |
130 |
defines/typedefs are utilized. |
131 |
|
132 |
the trouble here is that some of the linux/ headers define structs that the |
133 |
libc net/ headers define (like the if.h header). we cannot simply say |
134 |
"your program should not include linux/if.h when using net/if.h" because some |
135 |
of the other linux/ headers may correctly be utilized with net/if.h but they |
136 |
correctly include linux/if.h. we also cannot say "just use the linux/ headers |
137 |
and not the libc net/ headers" because the libc headers include more |
138 |
definitions than its kernel equivalent. |
139 |
|
140 |
since there is no obvious (at least to me) answer here, we hack the linux/ |
141 |
headers to simply pull in userspace headers and ignore the linux/ ones |
142 |
completely. this seems to give a proper clean userspace experience. |
143 |
|
144 |
--- a/include/linux/socket.h |
145 |
+++ b/include/linux/socket.h |
146 |
@@ -303,4 +303,9 @@ extern int put_cmsg(struct msghdr*, int |
147 |
|
148 |
#endif |
149 |
#endif /* not kernel and not glibc */ |
150 |
+ |
151 |
+#ifndef __KERNEL__ |
152 |
+# include <sys/socket.h> |
153 |
+#endif |
154 |
+ |
155 |
#endif /* _LINUX_SOCKET_H */ |
156 |
--- a/include/linux/stat.h |
157 |
+++ b/include/linux/stat.h |
158 |
@@ -74,4 +74,8 @@ struct kstat { |
159 |
|
160 |
#endif |
161 |
|
162 |
+#ifndef __KERNEL__ |
163 |
+# include <sys/stat.h> |
164 |
+#endif |
165 |
+ |
166 |
#endif |
167 |
--- a/include/linux/time.h |
168 |
+++ b/include/linux/time.h |
169 |
@@ -1,3 +1,9 @@ |
170 |
+#ifndef _LINUX_TIME_H |
171 |
+# include <time.h> |
172 |
+# include <sys/time.h> |
173 |
+# define _LINUX_TIME_H |
174 |
+#endif |
175 |
+ |
176 |
#ifndef _LINUX_TIME_H |
177 |
#define _LINUX_TIME_H |
178 |
|
179 |
--- a/include/linux/if.h |
180 |
+++ b/include/linux/if.h |
181 |
@@ -17,6 +17,11 @@ |
182 |
* 2 of the License, or (at your option) any later version. |
183 |
*/ |
184 |
#ifndef _LINUX_IF_H |
185 |
+# include <net/if.h> |
186 |
+# define _LINUX_IF_H |
187 |
+#endif |
188 |
+ |
189 |
+#ifndef _LINUX_IF_H |
190 |
#define _LINUX_IF_H |
191 |
|
192 |
#include <linux/types.h> /* for "__kernel_caddr_t" et al */ |
193 |
--- a/include/linux/ip.h |
194 |
+++ b/include/linux/ip.h |
195 |
@@ -15,6 +15,11 @@ |
196 |
* 2 of the License, or (at your option) any later version. |
197 |
*/ |
198 |
#ifndef _LINUX_IP_H |
199 |
+# include <netinet/ip.h> |
200 |
+# define _LINUX_IP_H |
201 |
+#endif |
202 |
+ |
203 |
+#ifndef _LINUX_IP_H |
204 |
#define _LINUX_IP_H |
205 |
#include <linux/types.h> |
206 |
#include <asm/byteorder.h> |
207 |
--- a/include/linux/cdrom.h |
208 |
+++ b/include/linux/cdrom.h |
209 |
@@ -11,6 +11,10 @@ |
210 |
#ifndef _LINUX_CDROM_H |
211 |
#define _LINUX_CDROM_H |
212 |
|
213 |
+#ifndef __KERNEL__ |
214 |
+# include <limits.h> |
215 |
+#endif |
216 |
+ |
217 |
#include <asm/byteorder.h> |
218 |
|
219 |
/******************************************************* |
220 |
|
221 |
|
222 |
|
223 |
1.1 src/patchsets/gentoo-headers/2.6.25/09_all_include-other-linux-headers.patch |
224 |
|
225 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/09_all_include-other-linux-headers.patch?rev=1.1&view=markup |
226 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.25/09_all_include-other-linux-headers.patch?rev=1.1&content-type=text/plain |
227 |
|
228 |
Index: 09_all_include-other-linux-headers.patch |
229 |
=================================================================== |
230 |
diff --git a/include/linux/atalk.h b/include/linux/atalk.h |
231 |
index 75b8bac..c0b7727 100644 |
232 |
--- a/include/linux/atalk.h |
233 |
+++ b/include/linux/atalk.h |
234 |
@@ -2,6 +2,7 @@ |
235 |
#define __LINUX_ATALK_H__ |
236 |
|
237 |
#include <asm/byteorder.h> |
238 |
+#include <linux/socket.h> |
239 |
|
240 |
/* |
241 |
* AppleTalk networking structures |
242 |
diff --git a/include/linux/atm.h b/include/linux/atm.h |
243 |
index 6013668..5e12916 100644 |
244 |
--- a/include/linux/atm.h |
245 |
+++ b/include/linux/atm.h |
246 |
@@ -16,10 +16,8 @@ |
247 |
* documentation. Do not change them. |
248 |
*/ |
249 |
|
250 |
-#ifdef __KERNEL__ |
251 |
#include <linux/socket.h> |
252 |
#include <linux/types.h> |
253 |
-#endif |
254 |
#include <linux/compiler.h> |
255 |
#include <linux/atmapi.h> |
256 |
#include <linux/atmsap.h> |
257 |
diff --git a/include/linux/atm_tcp.h b/include/linux/atm_tcp.h |
258 |
index 18787f9..e1eba63 100644 |
259 |
--- a/include/linux/atm_tcp.h |
260 |
+++ b/include/linux/atm_tcp.h |
261 |
@@ -8,10 +8,8 @@ |
262 |
#define LINUX_ATM_TCP_H |
263 |
|
264 |
#include <linux/atmapi.h> |
265 |
- |
266 |
-#ifdef __KERNEL__ |
267 |
#include <linux/types.h> |
268 |
-#endif |
269 |
+#include <linux/atm.h> |
270 |
#include <linux/atmioc.h> |
271 |
|
272 |
|
273 |
diff --git a/include/linux/atm_zatm.h b/include/linux/atm_zatm.h |
274 |
index 10f0fa2..ca03fef 100644 |
275 |
--- a/include/linux/atm_zatm.h |
276 |
+++ b/include/linux/atm_zatm.h |
277 |
@@ -12,6 +12,7 @@ |
278 |
* sys/types.h for struct timeval |
279 |
*/ |
280 |
|
281 |
+#include <linux/time.h> |
282 |
#include <linux/atmapi.h> |
283 |
#include <linux/atmioc.h> |
284 |
|
285 |
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h |
286 |
index c21e597..9a5c539 100644 |
287 |
--- a/include/linux/auto_fs.h |
288 |
+++ b/include/linux/auto_fs.h |
289 |
@@ -16,10 +16,10 @@ |
290 |
|
291 |
#ifdef __KERNEL__ |
292 |
#include <linux/fs.h> |
293 |
-#include <linux/limits.h> |
294 |
#include <asm/types.h> |
295 |
#endif /* __KERNEL__ */ |
296 |
|
297 |
+#include <linux/limits.h> |
298 |
#include <linux/ioctl.h> |
299 |
|
300 |
/* This file describes autofs v3 */ |
301 |
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h |
302 |
index 0a6bc52..ce9c79c 100644 |
303 |
--- a/include/linux/auto_fs4.h |
304 |
+++ b/include/linux/auto_fs4.h |
305 |
@@ -11,6 +11,8 @@ |
306 |
#ifndef _LINUX_AUTO_FS4_H |
307 |
#define _LINUX_AUTO_FS4_H |
308 |
|
309 |
+#include <linux/types.h> |
310 |
+ |
311 |
/* Include common v3 definitions */ |
312 |
#include <linux/auto_fs.h> |
313 |
|
314 |
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h |
315 |
index 8ed6dfd..2ca3e8f 100644 |
316 |
--- a/include/linux/bfs_fs.h |
317 |
+++ b/include/linux/bfs_fs.h |
318 |
@@ -6,6 +6,8 @@ |
319 |
#ifndef _LINUX_BFS_FS_H |
320 |
#define _LINUX_BFS_FS_H |
321 |
|
322 |
+#include <linux/types.h> |
323 |
+ |
324 |
#define BFS_BSIZE_BITS 9 |
325 |
#define BFS_BSIZE (1<<BFS_BSIZE_BITS) |
326 |
|
327 |
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h |
328 |
index 605ebe2..8d95b2f 100644 |
329 |
--- a/include/linux/cm4000_cs.h |
330 |
+++ b/include/linux/cm4000_cs.h |
331 |
@@ -1,6 +1,9 @@ |
332 |
#ifndef _CM4000_H_ |
333 |
#define _CM4000_H_ |
334 |
|
335 |
+#include <linux/types.h> |
336 |
+#include <linux/ioctl.h> |
337 |
+ |
338 |
#define MAX_ATR 33 |
339 |
|
340 |
#define CM4000_MAX_DEV 4 |
341 |
diff --git a/include/linux/dirent.h b/include/linux/dirent.h |
342 |
index 5d6023b..d5b642d 100644 |
343 |
--- a/include/linux/dirent.h |
344 |
+++ b/include/linux/dirent.h |
345 |
@@ -1,6 +1,8 @@ |
346 |
#ifndef _LINUX_DIRENT_H |
347 |
#define _LINUX_DIRENT_H |
348 |
|
349 |
+#include <linux/types.h> |
350 |
+ |
351 |
struct dirent { |
352 |
long d_ino; |
353 |
__kernel_off_t d_off; |
354 |
diff --git a/include/linux/dlm.h b/include/linux/dlm.h |
355 |
index 1b1dcb9..415c400 100644 |
356 |
--- a/include/linux/dlm.h |
357 |
+++ b/include/linux/dlm.h |
358 |
@@ -19,6 +19,8 @@ |
359 |
* routines and structures to use DLM lockspaces |
360 |
*/ |
361 |
|
362 |
+#include <linux/types.h> |
363 |
+ |
364 |
/* |
365 |
* Lock Modes |
366 |
*/ |
367 |
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h |
368 |
index 2a2dd18..52544a0 100644 |
369 |
--- a/include/linux/dlm_device.h |
370 |
+++ b/include/linux/dlm_device.h |
371 |
@@ -11,10 +11,16 @@ |
372 |
******************************************************************************* |
373 |
******************************************************************************/ |
374 |
|
375 |
+#ifndef _LINUX_DLM_DEVICE_H |
376 |
+#define _LINUX_DLM_DEVICE_H |
377 |
+ |
378 |
/* This is the device interface for dlm, most users will use a library |
379 |
* interface. |
380 |
*/ |
381 |
|
382 |
+#include <linux/dlm.h> |
383 |
+#include <linux/types.h> |
384 |
+ |
385 |
#define DLM_USER_LVB_LEN 32 |
386 |
|
387 |
/* Version of the device interface */ |
388 |
@@ -84,3 +90,4 @@ struct dlm_lock_result { |
389 |
#define DLM_USER_LSFLG_AUTOFREE 1 |
390 |
#define DLM_USER_LSFLG_FORCEFREE 2 |
391 |
|
392 |
+#endif |
393 |
diff --git a/include/linux/dn.h b/include/linux/dn.h |
394 |
index 10b6a6f..9a13dd6 100644 |
395 |
--- a/include/linux/dn.h |
396 |
+++ b/include/linux/dn.h |
397 |
@@ -7,6 +7,9 @@ |
398 |
|
399 |
*/ |
400 |
|
401 |
+#include <linux/ioctl.h> |
402 |
+#include <linux/types.h> |
403 |
+ |
404 |
/* |
405 |
* DNPROTO_NSP can't be the same as SOL_SOCKET, |
406 |
* so increment each by one (compared to ULTRIX) |
407 |
diff --git a/include/linux/efs_fs_sb.h b/include/linux/efs_fs_sb.h |
408 |
index ff1945e..a742b29 100644 |
409 |
--- a/include/linux/efs_fs_sb.h |
410 |
+++ b/include/linux/efs_fs_sb.h |
411 |
@@ -10,6 +10,7 @@ |
412 |
#define __EFS_FS_SB_H__ |
413 |
|
414 |
#include <linux/magic.h> |
415 |
+#include <linux/types.h> |
416 |
|
417 |
/* EFS superblock magic numbers */ |
418 |
#define EFS_MAGIC 0x072959 |
419 |
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h |
420 |
index 9631ddd..2d5484e 100644 |
421 |
--- a/include/linux/elfcore.h |
422 |
+++ b/include/linux/elfcore.h |
423 |
@@ -20,7 +20,6 @@ struct elf_siginfo |
424 |
typedef elf_greg_t greg_t; |
425 |
typedef elf_gregset_t gregset_t; |
426 |
typedef elf_fpregset_t fpregset_t; |
427 |
-typedef elf_fpxregset_t fpxregset_t; |
428 |
#define NGREG ELF_NGREG |
429 |
#endif |
430 |
|
431 |
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h |
432 |
index 92f8d4f..ceb1454 100644 |
433 |
--- a/include/linux/errqueue.h |
434 |
+++ b/include/linux/errqueue.h |
435 |
@@ -1,6 +1,8 @@ |
436 |
#ifndef _LINUX_ERRQUEUE_H |
437 |
#define _LINUX_ERRQUEUE_H 1 |
438 |
|
439 |
+#include <linux/types.h> |
440 |
+ |
441 |
struct sock_extended_err |
442 |
{ |
443 |
__u32 ee_errno; |
444 |
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h |
445 |
index 8b7e4c1..e707cb5 100644 |
446 |
--- a/include/linux/gfs2_ondisk.h |
447 |
+++ b/include/linux/gfs2_ondisk.h |
448 |
@@ -10,6 +10,8 @@ |
449 |
#ifndef __GFS2_ONDISK_DOT_H__ |
450 |
#define __GFS2_ONDISK_DOT_H__ |
451 |
|
452 |
+#include <linux/types.h> |
453 |
+ |
454 |
#define GFS2_MAGIC 0x01161970 |
455 |
#define GFS2_BASIC_BLOCK 512 |
456 |
#define GFS2_BASIC_BLOCK_SHIFT 9 |
457 |
diff --git a/include/linux/hdlc/ioctl.h b/include/linux/hdlc/ioctl.h |
458 |
index 5839723..09dc723 100644 |
459 |
--- a/include/linux/hdlc/ioctl.h |
460 |
+++ b/include/linux/hdlc/ioctl.h |
461 |
@@ -1,6 +1,7 @@ |
462 |
#ifndef __HDLC_IOCTL_H__ |
463 |
#define __HDLC_IOCTL_H__ |
464 |
|
465 |
+#include <linux/if.h> |
466 |
|
467 |
#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */ |
468 |
|
469 |
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h |
470 |
index acbdae6..3b35f72 100644 |
471 |
--- a/include/linux/hiddev.h |
472 |
+++ b/include/linux/hiddev.h |
473 |
@@ -29,6 +29,8 @@ |
474 |
* Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic |
475 |
*/ |
476 |
|
477 |
+#include <linux/types.h> |
478 |
+ |
479 |
/* |
480 |
* The event structure itself |
481 |
*/ |
482 |
diff --git a/include/linux/if_fc.h b/include/linux/if_fc.h |
483 |
index 376a34e..6ed7f1b 100644 |
484 |
--- a/include/linux/if_fc.h |
485 |
+++ b/include/linux/if_fc.h |
486 |
@@ -20,6 +20,7 @@ |
487 |
#ifndef _LINUX_IF_FC_H |
488 |
#define _LINUX_IF_FC_H |
489 |
|
490 |
+#include <linux/types.h> |
491 |
|
492 |
#define FC_ALEN 6 /* Octets in one ethernet addr */ |
493 |
#define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) |
494 |
diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h |
495 |
index 768372f..b8d05b8 100644 |
496 |
--- a/include/linux/if_ppp.h |
497 |
+++ b/include/linux/if_ppp.h |
498 |
@@ -36,6 +36,9 @@ |
499 |
#define _IF_PPP_H_ |
500 |
|
501 |
#include <linux/compiler.h> |
502 |
+#include <linux/if.h> |
503 |
+#include <linux/ppp_defs.h> |
504 |
+#include <linux/types.h> |
505 |
|
506 |
/* |
507 |
* Packet sizes |
508 |
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h |
509 |
index c6b13ff..a71510a 100644 |
510 |
--- a/include/linux/ppp_defs.h |
511 |
+++ b/include/linux/ppp_defs.h |
512 |
@@ -42,6 +42,8 @@ |
513 |
#ifndef _PPP_DEFS_H_ |
514 |
#define _PPP_DEFS_H_ |
515 |
|
516 |
+#include <linux/types.h> |
517 |
+ |
518 |
/* |
519 |
* The basic PPP frame. |
520 |
*/ |
521 |
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h |
522 |
index 4fab3d0..5f971f9 100644 |
523 |
--- a/include/linux/if_pppox.h |
524 |
+++ b/include/linux/if_pppox.h |
525 |
@@ -20,10 +20,10 @@ |
526 |
#include <asm/types.h> |
527 |
#include <asm/byteorder.h> |
528 |
|
529 |
-#ifdef __KERNEL__ |
530 |
#include <linux/if_ether.h> |
531 |
#include <linux/if.h> |
532 |
#include <linux/netdevice.h> |
533 |
+#ifdef __KERNEL__ |
534 |
#include <asm/semaphore.h> |
535 |
#include <linux/ppp_channel.h> |
536 |
#endif /* __KERNEL__ */ |
537 |
diff --git a/include/linux/if_strip.h b/include/linux/if_strip.h |
538 |
index fb5c5c9..6526a62 100644 |
539 |
--- a/include/linux/if_strip.h |
540 |
+++ b/include/linux/if_strip.h |
541 |
@@ -18,6 +18,8 @@ |
542 |
#ifndef __LINUX_STRIP_H |
543 |
#define __LINUX_STRIP_H |
544 |
|
545 |
+#include <linux/types.h> |
546 |
+ |
547 |
typedef struct { |
548 |
__u8 c[6]; |
549 |
} MetricomAddress; |
550 |
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h |
551 |
index 660b501..3331fc4 100644 |
552 |
--- a/include/linux/if_tunnel.h |
553 |
+++ b/include/linux/if_tunnel.h |
554 |
@@ -2,6 +2,9 @@ |
555 |
#define _IF_TUNNEL_H_ |
556 |
|
557 |
#include <linux/types.h> |
558 |
+#include <asm/byteorder.h> |
559 |
+#include <linux/if.h> |
560 |
+#include <linux/ip.h> |
561 |
|
562 |
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) |
563 |
#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1) |
564 |
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h |
565 |
index 6e8bc54..bc8c490 100644 |
566 |
--- a/include/linux/inet_diag.h |
567 |
+++ b/include/linux/inet_diag.h |
568 |
@@ -1,6 +1,8 @@ |
569 |
#ifndef _INET_DIAG_H_ |
570 |
#define _INET_DIAG_H_ 1 |
571 |
|
572 |
+#include <linux/types.h> |
573 |
+ |
574 |
/* Just some random number */ |
575 |
#define TCPDIAG_GETSOCK 18 |
576 |
#define DCCPDIAG_GETSOCK 19 |
577 |
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h |
578 |
index b323ff5..d5865f0 100644 |
579 |
--- a/include/linux/ipv6_route.h |
580 |
+++ b/include/linux/ipv6_route.h |
581 |
@@ -13,6 +13,8 @@ |
582 |
#ifndef _LINUX_IPV6_ROUTE_H |
583 |
#define _LINUX_IPV6_ROUTE_H |
584 |
|
585 |
+#include <linux/in6.h> |
586 |
+ |
587 |
#define RTF_DEFAULT 0x00010000 /* default - learned via ND */ |
588 |
#define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed) |
589 |
fallback, no routers on link */ |
590 |
diff --git a/include/linux/ipx.h b/include/linux/ipx.h |
591 |
index eb19b4e..22d379f 100644 |
592 |
--- a/include/linux/ipx.h |
593 |
+++ b/include/linux/ipx.h |
594 |
@@ -2,6 +2,7 @@ |
595 |
#define _IPX_H_ |
596 |
#include <linux/sockios.h> |
597 |
#include <linux/socket.h> |
598 |
+#include <linux/types.h> |
599 |
#define IPX_NODE_LEN 6 |
600 |
#define IPX_MTU 576 |
601 |
|
602 |
diff --git a/include/linux/irda.h b/include/linux/irda.h |
603 |
index 09d8f10..b41984f 100644 |
604 |
--- a/include/linux/irda.h |
605 |
+++ b/include/linux/irda.h |
606 |
@@ -31,6 +31,9 @@ |
607 |
* this one, or preferably to include <net/irda/irda.h> instead. |
608 |
* Jean II */ |
609 |
|
610 |
+#include <linux/types.h> |
611 |
+#include <linux/socket.h> |
612 |
+ |
613 |
/* Hint bit positions for first hint byte */ |
614 |
#define HINT_PNP 0x01 |
615 |
#define HINT_PDA 0x02 |
616 |
diff --git a/include/linux/llc.h b/include/linux/llc.h |
617 |
index 09f2e6d..f3a34ca 100644 |
618 |
--- a/include/linux/llc.h |
619 |
+++ b/include/linux/llc.h |
620 |
@@ -12,6 +12,10 @@ |
621 |
* |
622 |
* See the GNU General Public License for more details. |
623 |
*/ |
624 |
+ |
625 |
+#include <linux/if.h> |
626 |
+#include <linux/socket.h> |
627 |
+ |
628 |
#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */ |
629 |
struct sockaddr_llc { |
630 |
sa_family_t sllc_family; /* AF_LLC */ |
631 |
diff --git a/include/linux/lock_dlm_plock.h b/include/linux/lock_dlm_plock.h |
632 |
index fc34151..d3c2a54 100644 |
633 |
--- a/include/linux/lock_dlm_plock.h |
634 |
+++ b/include/linux/lock_dlm_plock.h |
635 |
@@ -9,6 +9,8 @@ |
636 |
#ifndef __LOCK_DLM_PLOCK_DOT_H__ |
637 |
#define __LOCK_DLM_PLOCK_DOT_H__ |
638 |
|
639 |
+#include <linux/types.h> |
640 |
+ |
641 |
#define GDLM_PLOCK_MISC_NAME "lock_dlm_plock" |
642 |
|
643 |
#define GDLM_PLOCK_VERSION_MAJOR 1 |
644 |
diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h |
645 |
index 916e8f7..bb33d11 100644 |
646 |
--- a/include/linux/minix_fs.h |
647 |
+++ b/include/linux/minix_fs.h |
648 |
@@ -2,6 +2,7 @@ |
649 |
#define _LINUX_MINIX_FS_H |
650 |
|
651 |
#include <linux/magic.h> |
652 |
+#include <linux/types.h> |
653 |
|
654 |
/* |
655 |
* The minix filesystem constants/structures |
656 |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h |
657 |
index 022edfa..175741c 100644 |
658 |
--- a/include/linux/netfilter/x_tables.h |
659 |
+++ b/include/linux/netfilter/x_tables.h |
660 |
@@ -1,6 +1,8 @@ |
661 |
#ifndef _X_TABLES_H |
662 |
#define _X_TABLES_H |
663 |
|
664 |
+#include <linux/types.h> |
665 |
+ |
666 |
#define XT_FUNCTION_MAXNAMELEN 30 |
667 |
#define XT_TABLE_MAXNAMELEN 32 |
668 |
|
669 |
diff --git a/include/linux/netrom.h b/include/linux/netrom.h |
670 |
index 6939b32..af7313c 100644 |
671 |
--- a/include/linux/netrom.h |
672 |
+++ b/include/linux/netrom.h |
673 |
@@ -7,6 +7,8 @@ |
674 |
#ifndef NETROM_KERNEL_H |
675 |
#define NETROM_KERNEL_H |
676 |
|
677 |
+#include <linux/ax25.h> |
678 |
+ |
679 |
#define NETROM_MTU 236 |
680 |
|
681 |
#define NETROM_T1 1 |
682 |
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h |
683 |
index 15a9f3b..91a1c24 100644 |
684 |
--- a/include/linux/nfs_idmap.h |
685 |
+++ b/include/linux/nfs_idmap.h |
686 |
@@ -37,6 +37,8 @@ |
687 |
#ifndef NFS_IDMAP_H |
688 |
#define NFS_IDMAP_H |
689 |
|
690 |
+#include <linux/types.h> |
691 |
+ |
692 |
/* XXX from bits/utmp.h */ |
693 |
#define IDMAP_NAMESZ 128 |
694 |
|
695 |
diff --git a/include/linux/nubus.h b/include/linux/nubus.h |
696 |
index 870e66a..72c8774 100644 |
697 |
--- a/include/linux/nubus.h |
698 |
+++ b/include/linux/nubus.h |
699 |
@@ -12,6 +12,8 @@ |
700 |
#ifndef LINUX_NUBUS_H |
701 |
#define LINUX_NUBUS_H |
702 |
|
703 |
+#include <linux/types.h> |
704 |
+ |
705 |
#ifdef __KERNEL__ |
706 |
#include <asm/nubus.h> |
707 |
#endif |
708 |
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h |
709 |
index c3f01b3..762f048 100644 |
710 |
--- a/include/linux/pkt_cls.h |
711 |
+++ b/include/linux/pkt_cls.h |
712 |
@@ -2,6 +2,7 @@ |
713 |
#define __LINUX_PKT_CLS_H |
714 |
|
715 |
#include <linux/pkt_sched.h> |
716 |
+#include <linux/types.h> |
717 |
|
718 |
/* I think i could have done better macros ; for now this is stolen from |
719 |
* some arch/mips code - jhs |
720 |
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h |
721 |
index d10f353..2169d79 100644 |
722 |
--- a/include/linux/pkt_sched.h |
723 |
+++ b/include/linux/pkt_sched.h |
724 |
@@ -1,6 +1,8 @@ |
725 |
#ifndef __LINUX_PKT_SCHED_H |
726 |
#define __LINUX_PKT_SCHED_H |
727 |
|
728 |
+#include <linux/types.h> |
729 |
+ |
730 |
/* Logical priority bands not depending on specific packet scheduler. |
731 |
Every scheduler will map them to real traffic classes, if it has |
732 |
no more precise mechanism to classify packets. |
733 |
diff --git a/include/linux/random.h b/include/linux/random.h |
734 |
index 01ad710..57195d0 100644 |
735 |
--- a/include/linux/random.h |
736 |
+++ b/include/linux/random.h |
737 |
@@ -8,6 +8,7 @@ |
738 |
#define _LINUX_RANDOM_H |
739 |
|
740 |
#include <linux/ioctl.h> |
741 |
+#include <linux/types.h> |
742 |
|
743 |
/* ioctl()'s for the random number generator */ |
744 |
|
745 |
diff --git a/include/linux/romfs_fs.h b/include/linux/romfs_fs.h |
746 |
index e20bbf9..1404f8d 100644 |
747 |
--- a/include/linux/romfs_fs.h |
748 |
+++ b/include/linux/romfs_fs.h |
749 |
@@ -1,6 +1,8 @@ |
750 |
#ifndef __LINUX_ROMFS_FS_H |
751 |
#define __LINUX_ROMFS_FS_H |
752 |
|
753 |
+#include <linux/types.h> |
754 |
+ |
755 |
/* The basic structures of the romfs filesystem */ |
756 |
|
757 |
#define ROMBSIZE BLOCK_SIZE |
758 |
diff --git a/include/linux/rose.h b/include/linux/rose.h |
759 |
index c7b4b18..5bcbba1 100644 |
760 |
--- a/include/linux/rose.h |
761 |
+++ b/include/linux/rose.h |
762 |
@@ -7,6 +7,9 @@ |
763 |
#ifndef ROSE_KERNEL_H |
764 |
#define ROSE_KERNEL_H |
765 |
|
766 |
+#include <linux/socket.h> |
767 |
+#include <linux/ax25.h> |
768 |
+ |
769 |
#define ROSE_MTU 251 |
770 |
|
771 |
#define ROSE_MAX_DIGIS 6 |
772 |
diff --git a/include/linux/scc.h b/include/linux/scc.h |
773 |
index 3495bd9..d5916e5 100644 |
774 |
--- a/include/linux/scc.h |
775 |
+++ b/include/linux/scc.h |
776 |
@@ -3,6 +3,7 @@ |
777 |
#ifndef _SCC_H |
778 |
#define _SCC_H |
779 |
|
780 |
+#include <linux/sockios.h> |
781 |
|
782 |
/* selection of hardware types */ |
783 |
|
784 |
diff --git a/include/linux/selinux_netlink.h b/include/linux/selinux_netlink.h |
785 |
index bbf489d..faf9675 100644 |
786 |
--- a/include/linux/selinux_netlink.h |
787 |
+++ b/include/linux/selinux_netlink.h |
788 |
@@ -12,6 +12,8 @@ |
789 |
#ifndef _LINUX_SELINUX_NETLINK_H |
790 |
#define _LINUX_SELINUX_NETLINK_H |
791 |
|
792 |
+#include <linux/types.h> |
793 |
+ |
794 |
/* Message types. */ |
795 |
#define SELNL_MSG_BASE 0x10 |
796 |
enum { |
797 |
diff --git a/include/linux/synclink.h b/include/linux/synclink.h |
798 |
index c8b0426..ba59b6d 100644 |
799 |
--- a/include/linux/synclink.h |
800 |
+++ b/include/linux/synclink.h |
801 |
@@ -11,6 +11,9 @@ |
802 |
|
803 |
#ifndef _SYNCLINK_H_ |
804 |
#define _SYNCLINK_H_ |
805 |
+ |
806 |
+#include <linux/types.h> |
807 |
+ |
808 |
#define SYNCLINK_H_VERSION 3.6 |
809 |
|
810 |
#define BOOLEAN int |
811 |
diff --git a/include/linux/un.h b/include/linux/un.h |
812 |
index 45561c5..77371f5 100644 |
813 |
--- a/include/linux/un.h |
814 |
+++ b/include/linux/un.h |
815 |
@@ -1,6 +1,8 @@ |
816 |
#ifndef _LINUX_UN_H |
817 |
#define _LINUX_UN_H |
818 |
|
819 |
+#include <linux/socket.h> |
820 |
+ |
821 |
#define UNIX_PATH_MAX 108 |
822 |
|
823 |
struct sockaddr_un { |
824 |
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h |
825 |
index 121e26d..e26c0c8 100644 |
826 |
--- a/include/linux/video_decoder.h |
827 |
+++ b/include/linux/video_decoder.h |
828 |
@@ -1,6 +1,8 @@ |
829 |
#ifndef _LINUX_VIDEO_DECODER_H |
830 |
#define _LINUX_VIDEO_DECODER_H |
831 |
|
832 |
+#include <linux/types.h> |
833 |
+ |
834 |
#define HAVE_VIDEO_DECODER 1 |
835 |
|
836 |
struct video_decoder_capability { /* this name is too long */ |
837 |
diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h |
838 |
index 4b0e690..b7b6423 100644 |
839 |
--- a/include/linux/video_encoder.h |
840 |
+++ b/include/linux/video_encoder.h |
841 |
@@ -1,6 +1,8 @@ |
842 |
#ifndef _LINUX_VIDEO_ENCODER_H |
843 |
#define _LINUX_VIDEO_ENCODER_H |
844 |
|
845 |
+#include <linux/types.h> |
846 |
+ |
847 |
struct video_encoder_capability { /* this name is too long */ |
848 |
__u32 flags; |
849 |
#define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */ |
850 |
diff --git a/include/linux/wireless.h b/include/linux/wireless.h |
851 |
index 7c269f4..9ba6355 100644 |
852 |
--- a/include/linux/wireless.h |
853 |
+++ b/include/linux/wireless.h |
854 |
@@ -72,11 +72,9 @@ |
855 |
/* This header is used in user-space, therefore need to be sanitised |
856 |
* for that purpose. Those includes are usually not compatible with glibc. |
857 |
* To know which includes to use in user-space, check iwlib.h. */ |
858 |
-#ifdef __KERNEL__ |
859 |
#include <linux/types.h> /* for "caddr_t" et al */ |
860 |
#include <linux/socket.h> /* for "struct sockaddr" et al */ |
861 |
#include <linux/if.h> /* for IFNAMSIZ and co... */ |
862 |
-#endif /* __KERNEL__ */ |
863 |
|
864 |
/***************************** VERSION *****************************/ |
865 |
/* |
866 |
diff --git a/include/linux/x25.h b/include/linux/x25.h |
867 |
index d035e4e..00dcc34 100644 |
868 |
--- a/include/linux/x25.h |
869 |
+++ b/include/linux/x25.h |
870 |
@@ -12,6 +12,7 @@ |
871 |
#define X25_KERNEL_H |
872 |
|
873 |
#include <linux/types.h> |
874 |
+#include <linux/socket.h> |
875 |
|
876 |
#define SIOCX25GSUBSCRIP (SIOCPROTOPRIVATE + 0) |
877 |
#define SIOCX25SSUBSCRIP (SIOCPROTOPRIVATE + 1) |
878 |
diff --git a/include/linux/times.h b/include/linux/times.h |
879 |
index e2d3020..813446f 100644 |
880 |
--- a/include/linux/times.h |
881 |
+++ b/include/linux/times.h |
882 |
@@ -2,6 +2,7 @@ |
883 |
#define _LINUX_TIMES_H |
884 |
|
885 |
#include <linux/types.h> |
886 |
+#include <linux/time.h> |
887 |
|
888 |
struct tms { |
889 |
clock_t tms_utime; |
890 |
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h |
891 |
index 153d755..0f9cac0 100644 |
892 |
--- a/include/linux/ext2_fs.h |
893 |
+++ b/include/linux/ext2_fs.h |
894 |
@@ -18,6 +18,7 @@ |
895 |
|
896 |
#include <linux/types.h> |
897 |
#include <linux/magic.h> |
898 |
+#include <linux/fs.h> |
899 |
|
900 |
/* |
901 |
* The second extended filesystem constants/structures |
902 |
diff --git a/include/linux/isdn_divertif.h b/include/linux/isdn_divertif.h |
903 |
index 0e7e44c..ec61201 100644 |
904 |
--- a/include/linux/isdn_divertif.h |
905 |
+++ b/include/linux/isdn_divertif.h |
906 |
@@ -10,6 +10,7 @@ |
907 |
* |
908 |
*/ |
909 |
|
910 |
+#include <linux/types.h> |
911 |
|
912 |
/***********************************************************/ |
913 |
/* magic value is also used to control version information */ |
914 |
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h |
915 |
index 8bcddcc..a84b922 100644 |
916 |
--- a/include/linux/nfsd/syscall.h |
917 |
+++ b/include/linux/nfsd/syscall.h |
918 |
@@ -10,10 +10,8 @@ |
919 |
#define NFSD_SYSCALL_H |
920 |
|
921 |
#include <asm/types.h> |
922 |
-#ifdef __KERNEL__ |
923 |
-# include <linux/types.h> |
924 |
-# include <linux/in.h> |
925 |
-#endif |
926 |
+#include <linux/types.h> |
927 |
+#include <linux/in.h> |
928 |
#include <linux/posix_types.h> |
929 |
#include <linux/nfsd/const.h> |
930 |
#include <linux/nfsd/export.h> |
931 |
--- a/include/linux/mroute.h |
932 |
+++ b/include/linux/mroute.h |
933 |
@@ -3,6 +3,7 @@ |
934 |
|
935 |
#include <linux/sockios.h> |
936 |
#include <linux/in.h> |
937 |
+#include <linux/types.h> |
938 |
|
939 |
/* |
940 |
* Based on the MROUTING 3.5 defines primarily to keep |
941 |
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h |
942 |
index a7d6a22..223c09d 100644 |
943 |
--- a/include/linux/if_pppol2tp.h |
944 |
+++ b/include/linux/if_pppol2tp.h |
945 |
@@ -15,11 +15,8 @@ |
946 |
#ifndef __LINUX_IF_PPPOL2TP_H |
947 |
#define __LINUX_IF_PPPOL2TP_H |
948 |
|
949 |
-#include <asm/types.h> |
950 |
- |
951 |
-#ifdef __KERNEL__ |
952 |
+#include <linux/types.h> |
953 |
#include <linux/in.h> |
954 |
-#endif |
955 |
|
956 |
/* Structure used to connect() the socket to a particular tunnel UDP |
957 |
* socket. |
958 |
|
959 |
|
960 |
|
961 |
-- |
962 |
gentoo-commits@l.g.o mailing list |