| blob | 44461d1abf7741fa821bbbcf8f0c21dcac0e976e |
1 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/addrspace.h linux-libc-headers-2.6.8.0/include/asm-mips/addrspace.h
2 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/addrspace.h 2004-03-28 07:51:50.000000000 -0600
3 +++ linux-libc-headers-2.6.8.0/include/asm-mips/addrspace.h 2004-08-26 05:53:12.000000000 -0500
4 @@ -10,7 +10,23 @@
5 #ifndef _ASM_ADDRSPACE_H
6 #define _ASM_ADDRSPACE_H
8 -#include <spaces.h>
9 +/**********************************************************************/
10 +/* Include the common bits for #include <spaces.h> */
11 +#ifndef __mips64
12 +
13 +#define CAC_BASE 0x80000000
14 +#define IO_BASE 0xa0000000
15 +#define UNCAC_BASE 0xa0000000
16 +#define MAP_BASE 0xc0000000
17 +
18 +/*
19 + * This handles the memory map.
20 + * We handle pages at KSEG0 for kernels with 32 bit address space.
21 + */
22 +#define PAGE_OFFSET 0x80000000UL
23 +
24 +#endif /* ndef __mips64 */
25 +/**********************************************************************/
27 /*
28 * Configure language
29 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/asmmacro.h linux-libc-headers-2.6.8.0/include/asm-mips/asmmacro.h
30 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/asmmacro.h 2004-08-18 13:15:41.000000000 -0500
31 +++ linux-libc-headers-2.6.8.0/include/asm-mips/asmmacro.h 2004-08-26 05:14:41.000000000 -0500
32 @@ -9,10 +9,10 @@
33 #define _ASM_ASMMACRO_H
36 -#ifdef CONFIG_MIPS32
37 +#ifndef __mips64
38 #include <asm/asmmacro-32.h>
39 #endif
40 -#ifdef CONFIG_MIPS64
41 +#ifdef __mips64
42 #include <asm/asmmacro-64.h>
43 #endif
45 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/checksum.h linux-libc-headers-2.6.8.0/include/asm-mips/checksum.h
46 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/checksum.h 2004-06-23 16:52:45.000000000 -0500
47 +++ linux-libc-headers-2.6.8.0/include/asm-mips/checksum.h 2004-08-26 05:14:41.000000000 -0500
48 @@ -125,7 +125,7 @@
49 {
50 __asm__(
51 ".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t"
52 -#ifdef CONFIG_MIPS32
53 +#ifndef __mips64
54 "addu\t%0, %2\n\t"
55 "sltu\t$1, %0, %2\n\t"
56 "addu\t%0, $1\n\t"
57 @@ -138,7 +138,7 @@
58 "sltu\t$1, %0, %4\n\t"
59 "addu\t%0, $1\n\t"
60 #endif
61 -#ifdef CONFIG_MIPS64
62 +#ifdef __mips64
63 "daddu\t%0, %2\n\t"
64 "daddu\t%0, %3\n\t"
65 "daddu\t%0, %4\n\t"
66 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/compat.h linux-libc-headers-2.6.8.0/include/asm-mips/compat.h
67 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/compat.h 2003-12-15 12:47:02.000000000 -0600
68 +++ linux-libc-headers-2.6.8.0/include/asm-mips/compat.h 2004-08-26 05:23:05.000000000 -0500
69 @@ -8,64 +8,64 @@
71 #define COMPAT_USER_HZ 100
73 -typedef u32 compat_size_t;
74 -typedef s32 compat_ssize_t;
75 -typedef s32 compat_time_t;
76 -typedef s32 compat_clock_t;
77 -typedef s32 compat_suseconds_t;
78 -
79 -typedef s32 compat_pid_t;
80 -typedef s32 compat_uid_t;
81 -typedef s32 compat_gid_t;
82 -typedef u32 compat_mode_t;
83 -typedef u32 compat_ino_t;
84 -typedef u32 compat_dev_t;
85 -typedef s32 compat_off_t;
86 -typedef s64 compat_loff_t;
87 -typedef u32 compat_nlink_t;
88 -typedef s32 compat_ipc_pid_t;
89 -typedef s32 compat_daddr_t;
90 -typedef s32 compat_caddr_t;
91 +typedef __u32 compat_size_t;
92 +typedef __s32 compat_ssize_t;
93 +typedef __s32 compat_time_t;
94 +typedef __s32 compat_clock_t;
95 +typedef __s32 compat_suseconds_t;
96 +
97 +typedef __s32 compat_pid_t;
98 +typedef __s32 compat_uid_t;
99 +typedef __s32 compat_gid_t;
100 +typedef __u32 compat_mode_t;
101 +typedef __u32 compat_ino_t;
102 +typedef __u32 compat_dev_t;
103 +typedef __s32 compat_off_t;
104 +typedef __s64 compat_loff_t;
105 +typedef __u32 compat_nlink_t;
106 +typedef __s32 compat_ipc_pid_t;
107 +typedef __s32 compat_daddr_t;
108 +typedef __s32 compat_caddr_t;
109 typedef struct {
110 - s32 val[2];
111 + __s32 val[2];
112 } compat_fsid_t;
114 -typedef s32 compat_int_t;
115 -typedef s32 compat_long_t;
116 -typedef u32 compat_uint_t;
117 -typedef u32 compat_ulong_t;
118 +typedef __s32 compat_int_t;
119 +typedef __s32 compat_long_t;
120 +typedef __u32 compat_uint_t;
121 +typedef __u32 compat_ulong_t;
123 struct compat_timespec {
124 compat_time_t tv_sec;
125 - s32 tv_nsec;
126 + __s32 tv_nsec;
127 };
129 struct compat_timeval {
130 compat_time_t tv_sec;
131 - s32 tv_usec;
132 + __s32 tv_usec;
133 };
135 struct compat_stat {
136 compat_dev_t st_dev;
137 - s32 st_pad1[3];
138 + __s32 st_pad1[3];
139 compat_ino_t st_ino;
140 compat_mode_t st_mode;
141 compat_nlink_t st_nlink;
142 compat_uid_t st_uid;
143 compat_gid_t st_gid;
144 compat_dev_t st_rdev;
145 - s32 st_pad2[2];
146 + __s32 st_pad2[2];
147 compat_off_t st_size;
148 - s32 st_pad3;
149 + __s32 st_pad3;
150 compat_time_t st_atime;
151 - s32 st_atime_nsec;
152 + __s32 st_atime_nsec;
153 compat_time_t st_mtime;
154 - s32 st_mtime_nsec;
155 + __s32 st_mtime_nsec;
156 compat_time_t st_ctime;
157 - s32 st_ctime_nsec;
158 - s32 st_blksize;
159 - s32 st_blocks;
160 - s32 st_pad4[14];
161 + __s32 st_ctime_nsec;
162 + __s32 st_blksize;
163 + __s32 st_blocks;
164 + __s32 st_pad4[14];
165 };
167 struct compat_flock {
168 @@ -73,10 +73,10 @@
169 short l_whence;
170 compat_off_t l_start;
171 compat_off_t l_len;
172 - s32 l_sysid;
173 + __s32 l_sysid;
174 compat_pid_t l_pid;
175 short __unused;
176 - s32 pad[4];
177 + __s32 pad[4];
178 };
180 #define F_GETLK64 33
181 @@ -107,12 +107,12 @@
183 #define COMPAT_RLIM_INFINITY 0x7fffffffUL
185 -typedef u32 compat_old_sigset_t; /* at least 32 bits */
186 +typedef __u32 compat_old_sigset_t; /* at least 32 bits */
188 #define _COMPAT_NSIG 128 /* Don't ask !$@#% ... */
189 #define _COMPAT_NSIG_BPW 32
191 -typedef u32 compat_sigset_word;
192 +typedef __u32 compat_sigset_word;
194 #define COMPAT_OFF_T_MAX 0x7fffffff
195 #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL
196 @@ -123,7 +123,7 @@
197 * as pointers because the syscall entry code will have
198 * appropriately comverted them already.
199 */
200 -typedef u32 compat_uptr_t;
201 +typedef __u32 compat_uptr_t;
203 static inline void *compat_ptr(compat_uptr_t uptr)
204 {
205 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5074.h linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5074.h
206 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5074.h 2003-12-15 12:47:03.000000000 -0600
207 +++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5074.h 2004-08-26 13:21:48.000000000 -0500
208 @@ -34,5 +34,5 @@
209 extern void ddb5074_led_d2(int on);
210 extern void ddb5074_led_d3(int on);
212 -extern void nile4_irq_setup(u32 base);
213 +extern void nile4_irq_setup(__u32 base);
214 #endif
215 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5476.h linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5476.h
216 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5476.h 2003-12-15 12:47:03.000000000 -0600
217 +++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5476.h 2004-08-26 05:24:06.000000000 -0500
218 @@ -145,13 +145,13 @@
219 extern void nile4_enable_irq(int nile4_irq);
220 extern void nile4_disable_irq(int nile4_irq);
221 extern void nile4_disable_irq_all(void);
222 -extern u16 nile4_get_irq_stat(int cpu_irq);
223 +extern __u16 nile4_get_irq_stat(int cpu_irq);
224 extern void nile4_enable_irq_output(int cpu_irq);
225 extern void nile4_disable_irq_output(int cpu_irq);
226 extern void nile4_set_pci_irq_polarity(int pci_irq, int high);
227 extern void nile4_set_pci_irq_level_or_edge(int pci_irq, int level);
228 extern void nile4_clear_irq(int nile4_irq);
229 -extern void nile4_clear_irq_mask(u32 mask);
230 -extern u8 nile4_i8259_iack(void);
231 +extern void nile4_clear_irq_mask(__u32 mask);
232 +extern __u8 nile4_i8259_iack(void);
233 extern void nile4_dump_irq_status(void); /* Debug */
234 #endif /* !__ASSEMBLY__ */
235 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5xxx.h linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5xxx.h
236 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5xxx.h 2004-01-17 17:03:47.000000000 -0600
237 +++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5xxx.h 2004-08-26 05:24:01.000000000 -0500
238 @@ -177,46 +177,46 @@
239 * interrupt load
240 */
241 #ifndef CONFIG_DDB5074
242 - volatile u32 *p = (volatile u32 *)0xbfc00000;
243 + volatile __u32 *p = (volatile __u32 *)0xbfc00000;
244 (void)(*p);
245 #endif
246 }
248 -static inline void ddb_out32(u32 offset, u32 val)
249 +static inline void ddb_out32(__u32 offset, __u32 val)
250 {
251 - *(volatile u32 *)(DDB_BASE+offset) = val;
252 + *(volatile __u32 *)(DDB_BASE+offset) = val;
253 ddb_sync();
254 }
256 -static inline u32 ddb_in32(u32 offset)
257 +static inline __u32 ddb_in32(__u32 offset)
258 {
259 - u32 val = *(volatile u32 *)(DDB_BASE+offset);
260 + __u32 val = *(volatile __u32 *)(DDB_BASE+offset);
261 ddb_sync();
262 return val;
263 }
265 -static inline void ddb_out16(u32 offset, u16 val)
266 +static inline void ddb_out16(__u32 offset, __u16 val)
267 {
268 - *(volatile u16 *)(DDB_BASE+offset) = val;
269 + *(volatile __u16 *)(DDB_BASE+offset) = val;
270 ddb_sync();
271 }
273 -static inline u16 ddb_in16(u32 offset)
274 +static inline __u16 ddb_in16(__u32 offset)
275 {
276 - u16 val = *(volatile u16 *)(DDB_BASE+offset);
277 + __u16 val = *(volatile __u16 *)(DDB_BASE+offset);
278 ddb_sync();
279 return val;
280 }
282 -static inline void ddb_out8(u32 offset, u8 val)
283 +static inline void ddb_out8(__u32 offset, __u8 val)
284 {
285 - *(volatile u8 *)(DDB_BASE+offset) = val;
286 + *(volatile __u8 *)(DDB_BASE+offset) = val;
287 ddb_sync();
288 }
290 -static inline u8 ddb_in8(u32 offset)
291 +static inline __u8 ddb_in8(__u32 offset)
292 {
293 - u8 val = *(volatile u8 *)(DDB_BASE+offset);
294 + __u8 val = *(volatile __u8 *)(DDB_BASE+offset);
295 ddb_sync();
296 return val;
297 }
298 @@ -226,10 +226,10 @@
299 * Physical Device Address Registers
300 */
302 -extern u32
303 -ddb_calc_pdar(u32 phys, u32 size, int width, int on_memory_bus, int pci_visible);
304 +extern __u32
305 +ddb_calc_pdar(__u32 phys, __u32 size, int width, int on_memory_bus, int pci_visible);
306 extern void
307 -ddb_set_pdar(u32 pdar, u32 phys, u32 size, int width,
308 +ddb_set_pdar(__u32 pdar, __u32 phys, __u32 size, int width,
309 int on_memory_bus, int pci_visible);
311 /*
312 @@ -248,7 +248,7 @@
313 #define DDB_PCI_ACCESS_32 0x10 /* for pci init0/1 regs */
316 -extern void ddb_set_pmr(u32 pmr, u32 type, u32 addr, u32 options);
317 +extern void ddb_set_pmr(__u32 pmr, __u32 type, __u32 addr, __u32 options);
319 /*
320 * we need to reset pci bus when we start up and shutdown
321 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/ioasic.h linux-libc-headers-2.6.8.0/include/asm-mips/dec/ioasic.h
322 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/ioasic.h 2004-01-17 17:03:47.000000000 -0600
323 +++ linux-libc-headers-2.6.8.0/include/asm-mips/dec/ioasic.h 2004-08-26 05:25:44.000000000 -0500
324 @@ -18,14 +18,14 @@
326 extern spinlock_t ioasic_ssr_lock;
328 -extern volatile u32 *ioasic_base;
329 +extern volatile __u32 *ioasic_base;
331 -static inline void ioasic_write(unsigned int reg, u32 v)
332 +static inline void ioasic_write(unsigned int reg, __u32 v)
333 {
334 ioasic_base[reg / 4] = v;
335 }
337 -static inline u32 ioasic_read(unsigned int reg)
338 +static inline __u32 ioasic_read(unsigned int reg)
339 {
340 return ioasic_base[reg / 4];
341 }
342 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/kn02.h linux-libc-headers-2.6.8.0/include/asm-mips/dec/kn02.h
343 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/kn02.h 2004-01-17 17:03:47.000000000 -0600
344 +++ linux-libc-headers-2.6.8.0/include/asm-mips/dec/kn02.h 2004-08-26 05:25:47.000000000 -0500
345 @@ -97,7 +97,7 @@
348 #ifndef __ASSEMBLY__
349 -extern u32 cached_kn02_csr;
350 +extern __u32 cached_kn02_csr;
351 extern spinlock_t kn02_lock;
352 extern void init_kn02_irqs(int base);
353 #endif
354 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/elf.h linux-libc-headers-2.6.8.0/include/asm-mips/elf.h
355 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/elf.h 2004-03-28 07:51:51.000000000 -0600
356 +++ linux-libc-headers-2.6.8.0/include/asm-mips/elf.h 2004-08-26 05:17:25.000000000 -0500
357 @@ -122,7 +122,7 @@
358 typedef double elf_fpreg_t;
359 typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
361 -#ifdef CONFIG_MIPS32
362 +#ifndef __mips64
364 /*
365 * This is used to ensure we don't load something for the wrong architecture.
366 @@ -150,9 +150,9 @@
367 */
368 #define ELF_CLASS ELFCLASS32
370 -#endif /* CONFIG_MIPS32 */
371 +#endif /* ndef __mips64 */
373 -#ifdef CONFIG_MIPS64
374 +#ifdef __mips64
375 /*
376 * This is used to ensure we don't load something for the wrong architecture.
377 */
378 @@ -174,7 +174,7 @@
379 */
380 #define ELF_CLASS ELFCLASS64
382 -#endif /* CONFIG_MIPS64 */
383 +#endif /* __mips64 */
385 /*
386 * These are used to set parameters in the core dumps.
387 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/ev96100.h linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/ev96100.h
388 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/ev96100.h 2004-03-28 07:51:53.000000000 -0600
389 +++ linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/ev96100.h 2004-08-26 05:23:12.000000000 -0500
390 @@ -46,9 +46,9 @@
391 * bytes when running bigendian.
392 */
393 #define __GT_READ(ofs) \
394 - (*(volatile u32 *)(GT64120_BASE+(ofs)))
395 + (*(volatile __u32 *)(GT64120_BASE+(ofs)))
396 #define __GT_WRITE(ofs, data) \
397 - do { *(volatile u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
398 + do { *(volatile __u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
399 #define GT_READ(ofs) le32_to_cpu(__GT_READ(ofs))
400 #define GT_WRITE(ofs, data) __GT_WRITE(ofs, cpu_to_le32(data))
402 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/gt96100.h linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/gt96100.h
403 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/gt96100.h 2004-03-28 07:51:53.000000000 -0600
404 +++ linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/gt96100.h 2004-08-26 05:23:17.000000000 -0500
405 @@ -27,9 +27,9 @@
406 #define MIPS_GT96100_BASE (KSEG1ADDR(0x14000000))
408 #define GT96100_WRITE(ofs, data) \
409 - *(volatile u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
410 + *(volatile __u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
411 #define GT96100_READ(ofs) \
412 - le32_to_cpu(*(volatile u32 *)(MIPS_GT96100_BASE+ofs))
413 + le32_to_cpu(*(volatile __u32 *)(MIPS_GT96100_BASE+ofs))
415 #define GT96100_ETH_IO_SIZE 0x4000
417 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/gt64120.h linux-libc-headers-2.6.8.0/include/asm-mips/gt64120.h
418 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/gt64120.h 2004-03-28 07:51:51.000000000 -0600
419 +++ linux-libc-headers-2.6.8.0/include/asm-mips/gt64120.h 2004-08-26 05:22:36.000000000 -0500
420 @@ -420,9 +420,9 @@
421 * bytes when running bigendian. We also provide non-swapping versions.
422 */
423 #define __GT_READ(ofs) \
424 - (*(volatile u32 *)(GT64120_BASE+(ofs)))
425 + (*(volatile __u32 *)(GT64120_BASE+(ofs)))
426 #define __GT_WRITE(ofs, data) \
427 - do { *(volatile u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
428 + do { *(volatile __u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
429 #define GT_READ(ofs) le32_to_cpu(__GT_READ(ofs))
430 #define GT_WRITE(ofs, data) __GT_WRITE(ofs, cpu_to_le32(data))
432 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/io.h linux-libc-headers-2.6.8.0/include/asm-mips/io.h
433 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/io.h 2004-03-28 07:51:51.000000000 -0600
434 +++ linux-libc-headers-2.6.8.0/include/asm-mips/io.h 2004-08-26 05:24:16.000000000 -0500
435 @@ -173,14 +173,14 @@
436 unsigned long flags)
437 {
438 if (cpu_has_64bit_addresses) {
439 - u64 base = UNCAC_BASE;
440 + __u64 base = UNCAC_BASE;
442 /*
443 * R10000 supports a 2 bit uncached attribute therefore
444 * UNCAC_BASE may not equal IO_BASE.
445 */
446 if (flags == _CACHE_UNCACHED)
447 - base = (u64) IO_BASE;
448 + base = (__u64) IO_BASE;
449 return (void *) (unsigned long) (base + offset);
450 }
452 @@ -245,10 +245,10 @@
453 #define __raw_readb(addr) (*(volatile unsigned char *)(addr))
454 #define __raw_readw(addr) (*(volatile unsigned short *)(addr))
455 #define __raw_readl(addr) (*(volatile unsigned int *)(addr))
456 -#ifdef CONFIG_MIPS32
457 +#ifndef __mips64
458 #define ____raw_readq(addr) \
459 ({ \
460 - u64 __res; \
461 + __u64 __res; \
462 \
463 __asm__ __volatile__ ( \
464 " .set mips3 # ____raw_readq \n" \
465 @@ -263,7 +263,7 @@
466 #define __raw_readq(addr) \
467 ({ \
468 unsigned long __flags; \
469 - u64 __res; \
470 + __u64 __res; \
471 \
472 local_irq_save(__flags); \
473 __res = ____raw_readq(addr); \
474 @@ -271,7 +271,7 @@
475 __res; \
476 })
477 #endif
478 -#ifdef CONFIG_MIPS64
479 +#ifdef __mips64
480 #define ____raw_readq(addr) (*(volatile unsigned long *)(addr))
481 #define __raw_readq(addr) ____raw_readq(addr)
482 #endif
483 @@ -288,10 +288,10 @@
484 #define __raw_writeb(b,addr) ((*(volatile unsigned char *)(addr)) = (b))
485 #define __raw_writew(w,addr) ((*(volatile unsigned short *)(addr)) = (w))
486 #define __raw_writel(l,addr) ((*(volatile unsigned int *)(addr)) = (l))
487 -#ifdef CONFIG_MIPS32
488 +#ifndef __mips64
489 #define ____raw_writeq(val,addr) \
490 ({ \
491 - u64 __tmp; \
492 + __u64 __tmp; \
493 \
494 __asm__ __volatile__ ( \
495 " .set mips3 \n" \
496 @@ -313,7 +313,7 @@
497 local_irq_restore(__flags); \
498 })
499 #endif
500 -#ifdef CONFIG_MIPS64
501 +#ifdef __mips64
502 #define ____raw_writeq(q,addr) ((*(volatile unsigned long *)(addr)) = (q))
503 #define __raw_writeq(q,addr) ____raw_writeq(q, addr)
504 #endif
505 @@ -400,28 +400,28 @@
506 {
507 port = __swizzle_addr_b(port);
509 - *(volatile u8 *)(mips_io_port_base + port) = __ioswab8(val);
510 + *(volatile __u8 *)(mips_io_port_base + port) = __ioswab8(val);
511 }
513 static inline void __outw(unsigned short val, unsigned long port)
514 {
515 port = __swizzle_addr_w(port);
517 - *(volatile u16 *)(mips_io_port_base + port) = __ioswab16(val);
518 + *(volatile __u16 *)(mips_io_port_base + port) = __ioswab16(val);
519 }
521 static inline void __outl(unsigned int val, unsigned long port)
522 {
523 port = __swizzle_addr_l(port);
525 - *(volatile u32 *)(mips_io_port_base + port) = __ioswab32(val);
526 + *(volatile __u32 *)(mips_io_port_base + port) = __ioswab32(val);
527 }
529 static inline void __outb_p(unsigned char val, unsigned long port)
530 {
531 port = __swizzle_addr_b(port);
533 - *(volatile u8 *)(mips_io_port_base + port) = __ioswab8(val);
534 + *(volatile __u8 *)(mips_io_port_base + port) = __ioswab8(val);
535 SLOW_DOWN_IO;
536 }
538 @@ -429,7 +429,7 @@
539 {
540 port = __swizzle_addr_w(port);
542 - *(volatile u16 *)(mips_io_port_base + port) = __ioswab16(val);
543 + *(volatile __u16 *)(mips_io_port_base + port) = __ioswab16(val);
544 SLOW_DOWN_IO;
545 }
547 @@ -437,7 +437,7 @@
548 {
549 port = __swizzle_addr_l(port);
551 - *(volatile u32 *)(mips_io_port_base + port) = __ioswab32(val);
552 + *(volatile __u32 *)(mips_io_port_base + port) = __ioswab32(val);
553 SLOW_DOWN_IO;
554 }
556 @@ -452,30 +452,30 @@
557 {
558 port = __swizzle_addr_b(port);
560 - return __ioswab8(*(volatile u8 *)(mips_io_port_base + port));
561 + return __ioswab8(*(volatile __u8 *)(mips_io_port_base + port));
562 }
564 static inline unsigned short __inw(unsigned long port)
565 {
566 port = __swizzle_addr_w(port);
568 - return __ioswab16(*(volatile u16 *)(mips_io_port_base + port));
569 + return __ioswab16(*(volatile __u16 *)(mips_io_port_base + port));
570 }
572 static inline unsigned int __inl(unsigned long port)
573 {
574 port = __swizzle_addr_l(port);
576 - return __ioswab32(*(volatile u32 *)(mips_io_port_base + port));
577 + return __ioswab32(*(volatile __u32 *)(mips_io_port_base + port));
578 }
580 static inline unsigned char __inb_p(unsigned long port)
581 {
582 - u8 __val;
583 + __u8 __val;
585 port = __swizzle_addr_b(port);
587 - __val = *(volatile u8 *)(mips_io_port_base + port);
588 + __val = *(volatile __u8 *)(mips_io_port_base + port);
589 SLOW_DOWN_IO;
591 return __ioswab8(__val);
592 @@ -483,11 +483,11 @@
594 static inline unsigned short __inw_p(unsigned long port)
595 {
596 - u16 __val;
597 + __u16 __val;
599 port = __swizzle_addr_w(port);
601 - __val = *(volatile u16 *)(mips_io_port_base + port);
602 + __val = *(volatile __u16 *)(mips_io_port_base + port);
603 SLOW_DOWN_IO;
605 return __ioswab16(__val);
606 @@ -495,11 +495,11 @@
608 static inline unsigned int __inl_p(unsigned long port)
609 {
610 - u32 __val;
611 + __u32 __val;
613 port = __swizzle_addr_l(port);
615 - __val = *(volatile u32 *)(mips_io_port_base + port);
616 + __val = *(volatile __u32 *)(mips_io_port_base + port);
617 SLOW_DOWN_IO;
619 return __ioswab32(__val);
620 @@ -515,7 +515,7 @@
621 static inline void __outsb(unsigned long port, void *addr, unsigned int count)
622 {
623 while (count--) {
624 - outb(*(u8 *)addr, port);
625 + outb(*(__u8 *)addr, port);
626 addr++;
627 }
628 }
629 @@ -523,7 +523,7 @@
630 static inline void __insb(unsigned long port, void *addr, unsigned int count)
631 {
632 while (count--) {
633 - *(u8 *)addr = inb(port);
634 + *(__u8 *)addr = inb(port);
635 addr++;
636 }
637 }
638 @@ -531,7 +531,7 @@
639 static inline void __outsw(unsigned long port, void *addr, unsigned int count)
640 {
641 while (count--) {
642 - outw(*(u16 *)addr, port);
643 + outw(*(__u16 *)addr, port);
644 addr += 2;
645 }
646 }
647 @@ -539,7 +539,7 @@
648 static inline void __insw(unsigned long port, void *addr, unsigned int count)
649 {
650 while (count--) {
651 - *(u16 *)addr = inw(port);
652 + *(__u16 *)addr = inw(port);
653 addr += 2;
654 }
655 }
656 @@ -547,7 +547,7 @@
657 static inline void __outsl(unsigned long port, void *addr, unsigned int count)
658 {
659 while (count--) {
660 - outl(*(u32 *)addr, port);
661 + outl(*(__u32 *)addr, port);
662 addr += 4;
663 }
664 }
665 @@ -555,7 +555,7 @@
666 static inline void __insl(unsigned long port, void *addr, unsigned int count)
667 {
668 while (count--) {
669 - *(u32 *)addr = inl(port);
670 + *(__u32 *)addr = inl(port);
671 addr += 4;
672 }
673 }
674 @@ -617,7 +617,7 @@
675 #define __CSR_32_ADJUST 0
676 #endif
678 -#define csr_out32(v,a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
679 -#define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
680 +#define csr_out32(v,a) (*(volatile __u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
681 +#define csr_in32(a) (*(volatile __u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
683 #endif /* _ASM_IO_H */
684 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ip32/mace.h linux-libc-headers-2.6.8.0/include/asm-mips/ip32/mace.h
685 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ip32/mace.h 2004-06-09 07:00:41.000000000 -0500
686 +++ linux-libc-headers-2.6.8.0/include/asm-mips/ip32/mace.h 2004-08-26 05:14:41.000000000 -0500
687 @@ -22,7 +22,7 @@
688 #undef BIT
689 #define BIT(x) (1ULL << (x))
691 -#ifdef CONFIG_MIPS32
692 +#ifndef __mips64
693 typedef struct {
694 volatile unsigned long long reg;
695 } mace64_t;
696 @@ -32,7 +32,7 @@
697 volatile unsigned long reg;
698 } mace32_t;
699 #endif
700 -#ifdef CONFIG_MIPS64
701 +#ifdef __mips64
702 typedef struct {
703 volatile unsigned long reg;
704 } mace64_t;
705 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/it8172/it8172.h linux-libc-headers-2.6.8.0/include/asm-mips/it8172/it8172.h
706 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/it8172/it8172.h 2003-12-15 12:47:03.000000000 -0600
707 +++ linux-libc-headers-2.6.8.0/include/asm-mips/it8172/it8172.h 2004-08-26 05:22:54.000000000 -0500
708 @@ -336,13 +336,13 @@
709 #define TIMER_TIDR 0x0E
712 -#define IT_WRITE(ofs, data) *(volatile u32 *)KSEG1ADDR((IT8172_BASE+ofs)) = data
713 -#define IT_READ(ofs, data) data = *(volatile u32 *)KSEG1ADDR((IT8172_BASE+ofs))
714 +#define IT_WRITE(ofs, data) *(volatile __u32 *)KSEG1ADDR((IT8172_BASE+ofs)) = data
715 +#define IT_READ(ofs, data) data = *(volatile __u32 *)KSEG1ADDR((IT8172_BASE+ofs))
717 -#define IT_IO_WRITE(ofs, data) *(volatile u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
718 -#define IT_IO_READ(ofs, data) data = *(volatile u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
719 +#define IT_IO_WRITE(ofs, data) *(volatile __u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
720 +#define IT_IO_READ(ofs, data) data = *(volatile __u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
722 -#define IT_IO_WRITE16(ofs, data) *(volatile u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
723 -#define IT_IO_READ16(ofs, data) data = *(volatile u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
724 +#define IT_IO_WRITE16(ofs, data) *(volatile __u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
725 +#define IT_IO_READ16(ofs, data) data = *(volatile __u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
727 #endif
728 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/head.h linux-libc-headers-2.6.8.0/include/asm-mips/lasat/head.h
729 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/head.h 2003-12-15 12:47:03.000000000 -0600
730 +++ linux-libc-headers-2.6.8.0/include/asm-mips/lasat/head.h 2004-08-26 05:23:42.000000000 -0500
731 @@ -10,12 +10,12 @@
732 #ifndef _LANGUAGE_ASSEMBLY
733 #include <linux/types.h>
734 struct bootloader_header {
735 - u32 magic[2];
736 - u32 version;
737 - u32 image_start;
738 - u32 image_size;
739 - u32 kernel_start;
740 - u32 kernel_entry;
741 + __u32 magic[2];
742 + __u32 version;
743 + __u32 image_start;
744 + __u32 image_size;
745 + __u32 kernel_start;
746 + __u32 kernel_entry;
747 };
748 #endif
750 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/lasat.h linux-libc-headers-2.6.8.0/include/asm-mips/lasat/lasat.h
751 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/lasat.h 2004-06-09 07:00:42.000000000 -0500
752 +++ linux-libc-headers-2.6.8.0/include/asm-mips/lasat/lasat.h 2004-08-26 05:23:50.000000000 -0500
753 @@ -25,9 +25,9 @@
754 #ifndef _LANGUAGE_ASSEMBLY
756 extern struct lasat_misc {
757 - volatile u32 *reset_reg;
758 - volatile u32 *flash_wp_reg;
759 - u32 flash_wp_bit;
760 + volatile __u32 *reset_reg;
761 + volatile __u32 *flash_wp_reg;
762 + __u32 flash_wp_bit;
763 } *lasat_misc;
765 enum lasat_mtdparts {
766 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/m48t35.h linux-libc-headers-2.6.8.0/include/asm-mips/m48t35.h
767 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/m48t35.h 2004-01-17 17:03:44.000000000 -0600
768 +++ linux-libc-headers-2.6.8.0/include/asm-mips/m48t35.h 2004-08-26 05:23:39.000000000 -0500
769 @@ -8,15 +8,15 @@
770 extern spinlock_t rtc_lock;
772 struct m48t35_rtc {
773 - volatile u8 pad[0x7ff8]; /* starts at 0x7ff8 */
774 - volatile u8 control;
775 - volatile u8 sec;
776 - volatile u8 min;
777 - volatile u8 hour;
778 - volatile u8 day;
779 - volatile u8 date;
780 - volatile u8 month;
781 - volatile u8 year;
782 + volatile __u8 pad[0x7ff8]; /* starts at 0x7ff8 */
783 + volatile __u8 control;
784 + volatile __u8 sec;
785 + volatile __u8 min;
786 + volatile __u8 hour;
787 + volatile __u8 day;
788 + volatile __u8 date;
789 + volatile __u8 month;
790 + volatile __u8 year;
791 };
793 #define M48T35_RTC_SET 0x80
794 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/bonito64.h linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/bonito64.h
795 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/bonito64.h 2004-03-28 07:51:54.000000000 -0600
796 +++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/bonito64.h 2004-08-26 05:21:59.000000000 -0500
797 @@ -34,7 +34,7 @@
798 extern unsigned long _pcictrl_bonito;
799 extern unsigned long _pcictrl_bonito_pcicfg;
801 -#define BONITO(x) *(volatile u32 *)(_pcictrl_bonito + (x))
802 +#define BONITO(x) *(volatile __u32 *)(_pcictrl_bonito + (x))
804 #endif /* __ASSEMBLY__ */
806 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/generic.h linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/generic.h
807 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/generic.h 2004-03-28 07:51:54.000000000 -0600
808 +++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/generic.h 2004-08-26 05:22:06.000000000 -0500
809 @@ -74,7 +74,7 @@
810 #define MIPS_REVISION_CORID_CORE_EMUL_BON 0x63
811 #define MIPS_REVISION_CORID_CORE_EMUL_MSC 0x65
813 -#define MIPS_REVISION_CORID (((*(volatile u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
814 +#define MIPS_REVISION_CORID (((*(volatile __u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
816 extern unsigned int mips_revision_corid;
818 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/msc01_pci.h linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/msc01_pci.h
819 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/msc01_pci.h 2004-03-28 07:51:54.000000000 -0600
820 +++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/msc01_pci.h 2004-08-26 05:22:10.000000000 -0500
821 @@ -212,8 +212,8 @@
823 #define MSC01_PCI_REG_BASE _pcictrl_msc
825 -#define MSC_WRITE(reg, data) do { *(volatile u32 *)(reg) = data; } while (0)
826 -#define MSC_READ(reg, data) do { data = *(volatile u32 *)(reg); } while (0)
827 +#define MSC_WRITE(reg, data) do { *(volatile __u32 *)(reg) = data; } while (0)
828 +#define MSC_READ(reg, data) do { data = *(volatile __u32 *)(reg); } while (0)
830 /*
831 * Registers absolute addresses
832 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mipsregs.h linux-libc-headers-2.6.8.0/include/asm-mips/mipsregs.h
833 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mipsregs.h 2004-08-18 13:15:41.000000000 -0500
834 +++ linux-libc-headers-2.6.8.0/include/asm-mips/mipsregs.h 2004-08-26 13:00:51.000000000 -0500
835 @@ -14,7 +14,6 @@
836 #define _ASM_MIPSREGS_H
838 #include <linux/linkage.h>
839 -#include <asm/hazards.h>
841 /*
842 * The following macros are especially useful for __asm__
843 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mmu_context.h linux-libc-headers-2.6.8.0/include/asm-mips/mmu_context.h
844 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mmu_context.h 2004-08-18 13:15:41.000000000 -0500
845 +++ linux-libc-headers-2.6.8.0/include/asm-mips/mmu_context.h 2004-08-26 05:14:41.000000000 -0500
846 @@ -27,12 +27,12 @@
847 */
848 #define TLBMISS_HANDLER_SETUP_PGD(pgd) \
849 pgd_current[smp_processor_id()] = (unsigned long)(pgd)
850 -#ifdef CONFIG_MIPS32
851 +#ifndef __mips64
852 #define TLBMISS_HANDLER_SETUP() \
853 write_c0_context((unsigned long) smp_processor_id() << 23); \
854 TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
855 #endif
856 -#ifdef CONFIG_MIPS64
857 +#ifdef __mips64
858 #define TLBMISS_HANDLER_SETUP() \
859 write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \
860 TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
861 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/module.h linux-libc-headers-2.6.8.0/include/asm-mips/module.h
862 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/module.h 2004-08-18 13:15:41.000000000 -0500
863 +++ linux-libc-headers-2.6.8.0/include/asm-mips/module.h 2004-08-26 05:14:41.000000000 -0500
864 @@ -21,7 +21,7 @@
865 Elf64_Sxword r_addend; /* Addend. */
866 } Elf64_Mips_Rela;
868 -#ifdef CONFIG_MIPS32
869 +#ifndef __mips64
871 #define Elf_Shdr Elf32_Shdr
872 #define Elf_Sym Elf32_Sym
873 @@ -29,7 +29,7 @@
875 #endif
877 -#ifdef CONFIG_MIPS64
878 +#ifdef __mips64
880 #define Elf_Shdr Elf64_Shdr
881 #define Elf_Sym Elf64_Sym
882 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/msgbuf.h linux-libc-headers-2.6.8.0/include/asm-mips/msgbuf.h
883 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/msgbuf.h 2004-01-17 17:03:44.000000000 -0600
884 +++ linux-libc-headers-2.6.8.0/include/asm-mips/msgbuf.h 2004-08-26 05:15:04.000000000 -0500
885 @@ -14,25 +14,25 @@
887 struct msqid64_ds {
888 struct ipc64_perm msg_perm;
889 -#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
890 +#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
891 unsigned long __unused1;
892 #endif
893 __kernel_time_t msg_stime; /* last msgsnd time */
894 -#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
895 +#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
896 unsigned long __unused1;
897 #endif
898 -#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
899 +#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
900 unsigned long __unused2;
901 #endif
902 __kernel_time_t msg_rtime; /* last msgrcv time */
903 -#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
904 +#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
905 unsigned long __unused2;
906 #endif
907 -#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
908 +#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
909 unsigned long __unused3;
910 #endif
911 __kernel_time_t msg_ctime; /* last change time */
912 -#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
913 +#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
914 unsigned long __unused3;
915 #endif
916 unsigned long msg_cbytes; /* current number of bytes on queue */
917 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/nile4.h linux-libc-headers-2.6.8.0/include/asm-mips/nile4.h
918 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/nile4.h 2003-12-15 12:47:02.000000000 -0600
919 +++ linux-libc-headers-2.6.8.0/include/asm-mips/nile4.h 2004-08-26 05:22:46.000000000 -0500
920 @@ -202,45 +202,45 @@
922 static inline void nile4_sync(void)
923 {
924 - volatile u32 *p = (volatile u32 *)0xbfc00000;
925 + volatile __u32 *p = (volatile __u32 *)0xbfc00000;
926 (void)(*p);
927 }
929 -static inline void nile4_out32(u32 offset, u32 val)
930 +static inline void nile4_out32(__u32 offset, __u32 val)
931 {
932 - *(volatile u32 *)(NILE4_BASE+offset) = val;
933 + *(volatile __u32 *)(NILE4_BASE+offset) = val;
934 nile4_sync();
935 }
937 -static inline u32 nile4_in32(u32 offset)
938 +static inline __u32 nile4_in32(__u32 offset)
939 {
940 - u32 val = *(volatile u32 *)(NILE4_BASE+offset);
941 + __u32 val = *(volatile __u32 *)(NILE4_BASE+offset);
942 nile4_sync();
943 return val;
944 }
946 -static inline void nile4_out16(u32 offset, u16 val)
947 +static inline void nile4_out16(__u32 offset, __u16 val)
948 {
949 - *(volatile u16 *)(NILE4_BASE+offset) = val;
950 + *(volatile __u16 *)(NILE4_BASE+offset) = val;
951 nile4_sync();
952 }
954 -static inline u16 nile4_in16(u32 offset)
955 +static inline __u16 nile4_in16(__u32 offset)
956 {
957 - u16 val = *(volatile u16 *)(NILE4_BASE+offset);
958 + __u16 val = *(volatile __u16 *)(NILE4_BASE+offset);
959 nile4_sync();
960 return val;
961 }
963 -static inline void nile4_out8(u32 offset, u8 val)
964 +static inline void nile4_out8(__u32 offset, __u8 val)
965 {
966 - *(volatile u8 *)(NILE4_BASE+offset) = val;
967 + *(volatile __u8 *)(NILE4_BASE+offset) = val;
968 nile4_sync();
969 }
971 -static inline u8 nile4_in8(u32 offset)
972 +static inline __u8 nile4_in8(__u32 offset)
973 {
974 - u8 val = *(volatile u8 *)(NILE4_BASE+offset);
975 + __u8 val = *(volatile __u8 *)(NILE4_BASE+offset);
976 nile4_sync();
977 return val;
978 }
979 @@ -250,7 +250,7 @@
980 * Physical Device Address Registers
981 */
983 -extern void nile4_set_pdar(u32 pdar, u32 phys, u32 size, int width,
984 +extern void nile4_set_pdar(__u32 pdar, __u32 phys, __u32 size, int width,
985 int on_memory_bus, int visible);
988 @@ -276,7 +276,7 @@
989 #define NILE4_PCI_IACK_BASE NILE4_PCI_IO_BASE
992 -extern void nile4_set_pmr(u32 pmr, u32 type, u32 addr);
993 +extern void nile4_set_pmr(__u32 pmr, __u32 type, __u32 addr);
996 /*
997 @@ -296,14 +296,14 @@
998 extern void nile4_enable_irq(unsigned int nile4_irq);
999 extern void nile4_disable_irq(unsigned int nile4_irq);
1000 extern void nile4_disable_irq_all(void);
1001 -extern u16 nile4_get_irq_stat(int cpu_irq);
1002 +extern __u16 nile4_get_irq_stat(int cpu_irq);
1003 extern void nile4_enable_irq_output(int cpu_irq);
1004 extern void nile4_disable_irq_output(int cpu_irq);
1005 extern void nile4_set_pci_irq_polarity(int pci_irq, int high);
1006 extern void nile4_set_pci_irq_level_or_edge(int pci_irq, int level);
1007 extern void nile4_clear_irq(int nile4_irq);
1008 -extern void nile4_clear_irq_mask(u32 mask);
1009 -extern u8 nile4_i8259_iack(void);
1010 +extern void nile4_clear_irq_mask(__u32 mask);
1011 +extern __u8 nile4_i8259_iack(void);
1012 extern void nile4_dump_irq_status(void); /* Debug */
1014 #endif
1015 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/paccess.h linux-libc-headers-2.6.8.0/include/asm-mips/paccess.h
1016 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/paccess.h 2004-01-17 17:03:44.000000000 -0600
1017 +++ linux-libc-headers-2.6.8.0/include/asm-mips/paccess.h 2004-08-26 05:17:48.000000000 -0500
1018 @@ -14,11 +14,12 @@
1019 #define _ASM_PACCESS_H
1021 #include <linux/errno.h>
1022 +#include <linux/linkage.h>
1024 -#ifdef CONFIG_MIPS32
1025 +#ifndef __mips64
1026 #define __PA_ADDR ".word"
1027 #endif
1028 -#ifdef CONFIG_MIPS64
1029 +#ifdef __mips64
1030 #define __PA_ADDR ".dword"
1031 #endif
1033 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci/bridge.h linux-libc-headers-2.6.8.0/include/asm-mips/pci/bridge.h
1034 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci/bridge.h 2004-03-28 07:51:54.000000000 -0600
1035 +++ linux-libc-headers-2.6.8.0/include/asm-mips/pci/bridge.h 2004-08-26 05:25:40.000000000 -0500
1036 @@ -48,9 +48,9 @@
1037 * All accesses to bridge hardware registers must be done
1038 * using 32-bit loads and stores.
1039 */
1040 -typedef u32 bridgereg_t;
1041 +typedef __u32 bridgereg_t;
1043 -typedef u64 bridge_ate_t;
1044 +typedef __u64 bridge_ate_t;
1046 /* pointers to bridge ATEs
1047 * are always "pointer to volatile"
1048 @@ -199,37 +199,37 @@
1050 /* PCI Device Configuration Spaces 0x020000-0x027FFF */
1051 union { /* make all access sizes available. */
1052 - u8 c[0x1000 / 1];
1053 - u16 s[0x1000 / 2];
1054 - u32 l[0x1000 / 4];
1055 - u64 d[0x1000 / 8];
1056 + __u8 c[0x1000 / 1];
1057 + __u16 s[0x1000 / 2];
1058 + __u32 l[0x1000 / 4];
1059 + __u64 d[0x1000 / 8];
1060 union {
1061 - u8 c[0x100 / 1];
1062 - u16 s[0x100 / 2];
1063 - u32 l[0x100 / 4];
1064 - u64 d[0x100 / 8];
1065 + __u8 c[0x100 / 1];
1066 + __u16 s[0x100 / 2];
1067 + __u32 l[0x100 / 4];
1068 + __u64 d[0x100 / 8];
1069 } f[8];
1070 } b_type0_cfg_dev[8]; /* 0x020000 */
1072 /* PCI Type 1 Configuration Space 0x028000-0x028FFF */
1073 union { /* make all access sizes available. */
1074 - u8 c[0x1000 / 1];
1075 - u16 s[0x1000 / 2];
1076 - u32 l[0x1000 / 4];
1077 - u64 d[0x1000 / 8];
1078 + __u8 c[0x1000 / 1];
1079 + __u16 s[0x1000 / 2];
1080 + __u32 l[0x1000 / 4];
1081 + __u64 d[0x1000 / 8];
1082 } b_type1_cfg; /* 0x028000-0x029000 */
1084 char _pad_029000[0x007000]; /* 0x029000-0x030000 */
1086 /* PCI Interrupt Acknowledge Cycle 0x030000 */
1087 union {
1088 - u8 c[8 / 1];
1089 - u16 s[8 / 2];
1090 - u32 l[8 / 4];
1091 - u64 d[8 / 8];
1092 + __u8 c[8 / 1];
1093 + __u16 s[8 / 2];
1094 + __u32 l[8 / 4];
1095 + __u64 d[8 / 8];
1096 } b_pci_iack; /* 0x030000 */
1098 - u8 _pad_030007[0x04fff8]; /* 0x030008-0x07FFFF */
1099 + __u8 _pad_030007[0x04fff8]; /* 0x030008-0x07FFFF */
1101 /* External Address Translation Entry RAM 0x080000-0x0FFFFF */
1102 bridge_ate_t b_ext_ate_ram[0x10000];
1103 @@ -239,10 +239,10 @@
1105 /* PCI/GIO Device Spaces 0x200000-0xBFFFFF */
1106 union { /* make all access sizes available. */
1107 - u8 c[0x100000 / 1];
1108 - u16 s[0x100000 / 2];
1109 - u32 l[0x100000 / 4];
1110 - u64 d[0x100000 / 8];
1111 + __u8 c[0x100000 / 1];
1112 + __u16 s[0x100000 / 2];
1113 + __u32 l[0x100000 / 4];
1114 + __u64 d[0x100000 / 8];
1115 } b_devio_raw[10]; /* 0x200000 */
1117 /* b_devio macro is a bit strange; it reflects the
1118 @@ -253,10 +253,10 @@
1120 /* External Flash Proms 1,0 0xC00000-0xFFFFFF */
1121 union { /* make all access sizes available. */
1122 - u8 c[0x400000 / 1]; /* read-only */
1123 - u16 s[0x400000 / 2]; /* read-write */
1124 - u32 l[0x400000 / 4]; /* read-only */
1125 - u64 d[0x400000 / 8]; /* read-only */
1126 + __u8 c[0x400000 / 1]; /* read-only */
1127 + __u16 s[0x400000 / 2]; /* read-write */
1128 + __u32 l[0x400000 / 4]; /* read-only */
1129 + __u64 d[0x400000 / 8]; /* read-only */
1130 } b_external_flash; /* 0xC00000 */
1131 } bridge_t;
1133 @@ -266,9 +266,9 @@
1134 */
1135 typedef struct bridge_err_cmdword_s {
1136 union {
1137 - u32 cmd_word;
1138 + __u32 cmd_word;
1139 struct {
1140 - u32 didn:4, /* Destination ID */
1141 + __u32 didn:4, /* Destination ID */
1142 sidn:4, /* Source ID */
1143 pactyp:4, /* Packet type */
1144 tnum:5, /* Trans Number */
1145 @@ -799,17 +799,17 @@
1146 #ifndef __ASSEMBLY__
1147 /* Address translation entry for mapped pci32 accesses */
1148 typedef union ate_u {
1149 - u64 ent;
1150 + __u64 ent;
1151 struct ate_s {
1152 - u64 rmf:16;
1153 - u64 addr:36;
1154 - u64 targ:4;
1155 - u64 reserved:3;
1156 - u64 barrier:1;
1157 - u64 prefetch:1;
1158 - u64 precise:1;
1159 - u64 coherent:1;
1160 - u64 valid:1;
1161 + __u64 rmf:16;
1162 + __u64 addr:36;
1163 + __u64 targ:4;
1164 + __u64 reserved:3;
1165 + __u64 barrier:1;
1166 + __u64 prefetch:1;
1167 + __u64 precise:1;
1168 + __u64 coherent:1;
1169 + __u64 valid:1;
1170 } field;
1171 } ate_t;
1172 #endif /* !__ASSEMBLY__ */
1173 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci_channel.h linux-libc-headers-2.6.8.0/include/asm-mips/pci_channel.h
1174 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci_channel.h 2004-03-28 07:51:52.000000000 -0600
1175 +++ linux-libc-headers-2.6.8.0/include/asm-mips/pci_channel.h 2004-08-26 05:21:47.000000000 -0500
1176 @@ -41,6 +41,6 @@
1177 /*
1178 * board supplied pci irq fixup routine
1179 */
1180 -extern int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
1181 +extern int pcibios_map_irq(struct pci_dev *dev, __u8 slot, __u8 pin);
1183 #endif /* __ASM_PCI_CHANNEL_H */
1184 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/pgalloc.h linux-libc-headers-2.6.8.0/include/asm-mips/pgalloc.h
1185 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pgalloc.h 2004-06-09 07:00:41.000000000 -0500
1186 +++ linux-libc-headers-2.6.8.0/include/asm-mips/pgalloc.h 2004-08-26 05:14:41.000000000 -0500
1187 @@ -85,7 +85,7 @@
1189 #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
1191 -#ifdef CONFIG_MIPS32
1192 +#ifndef __mips64
1193 #define pgd_populate(mm, pmd, pte) BUG()
1195 /*
1196 @@ -97,7 +97,7 @@
1197 #define __pmd_free_tlb(tlb,x) do { } while (0)
1198 #endif
1200 -#ifdef CONFIG_MIPS64
1201 +#ifdef __mips64
1203 #define pgd_populate(mm, pgd, pmd) set_pgd(pgd, __pgd(pmd))
1205 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/prctl.h linux-libc-headers-2.6.8.0/include/asm-mips/prctl.h
1206 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/prctl.h 2003-12-15 12:47:02.000000000 -0600
1207 +++ linux-libc-headers-2.6.8.0/include/asm-mips/prctl.h 2004-08-26 05:21:43.000000000 -0500
1208 @@ -12,21 +12,21 @@
1209 #define PRDA ((struct prda *) PRDA_ADDRESS)
1211 struct prda_sys {
1212 - pid_t t_pid;
1213 - u32 t_hint;
1214 - u32 t_dlactseq;
1215 - u32 t_fpflags;
1216 - u32 t_prid; /* processor type, $prid CP0 register */
1217 - u32 t_dlendseq;
1218 - u64 t_unused1[5];
1219 - pid_t t_rpid;
1220 - s32 t_resched;
1221 - u32 t_unused[8];
1222 - u32 t_cpu; /* current/last cpu */
1223 + pid_t t_pid;
1224 + __u32 t_hint;
1225 + __u32 t_dlactseq;
1226 + __u32 t_fpflags;
1227 + __u32 t_prid; /* processor type, $prid CP0 register */
1228 + __u32 t_dlendseq;
1229 + __u64 t_unused1[5];
1230 + pid_t t_rpid;
1231 + __s32 t_resched;
1232 + __u32 t_unused[8];
1233 + __u32 t_cpu; /* current/last cpu */
1235 /* FIXME: The signal information, not supported by Linux now */
1236 - u32 t_flags; /* if true, then the sigprocmask is in userspace */
1237 - u32 t_sigprocmask [1]; /* the sigprocmask */
1238 + __u32 t_flags; /* if true, then the sigprocmask is in userspace */
1239 + __u32 t_sigprocmask [1]; /* the sigprocmask */
1240 };
1242 struct prda {
1243 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/processor.h linux-libc-headers-2.6.8.0/include/asm-mips/processor.h
1244 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/processor.h 2004-08-18 13:15:41.000000000 -0500
1245 +++ linux-libc-headers-2.6.8.0/include/asm-mips/processor.h 2004-08-26 05:23:24.000000000 -0500
1246 @@ -102,7 +102,7 @@
1247 #define MCA_bus 0
1248 #define MCA_bus__is_a_macro /* for versions in ksyms.c */
1250 -#ifdef CONFIG_MIPS32
1251 +#ifndef __mips64
1252 /*
1253 * User space process size: 2GB. This is hardcoded into a few places,
1254 * so don't change it unless you know what you are doing.
1255 @@ -116,7 +116,7 @@
1256 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
1257 #endif
1259 -#ifdef CONFIG_MIPS64
1260 +#ifdef __mips64
1261 /*
1262 * User space process size: 1TB. This is hardcoded into a few places,
1263 * so don't change it unless you know what you are doing. TASK_SIZE
1264 @@ -142,7 +142,7 @@
1266 #define NUM_FPU_REGS 32
1268 -typedef u64 fpureg_t;
1269 +typedef __u64 fpureg_t;
1271 struct mips_fpu_hard_struct {
1272 fpureg_t fpr[NUM_FPU_REGS];
1273 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ptrace.h linux-libc-headers-2.6.8.0/include/asm-mips/ptrace.h
1274 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ptrace.h 2004-03-28 07:51:52.000000000 -0600
1275 +++ linux-libc-headers-2.6.8.0/include/asm-mips/ptrace.h 2004-08-26 05:14:41.000000000 -0500
1276 @@ -27,7 +27,7 @@
1277 * system call/exception. As usual the registers k0/k1 aren't being saved.
1278 */
1279 struct pt_regs {
1280 -#ifdef CONFIG_MIPS32
1281 +#ifndef __mips64
1282 /* Pad bytes for argument save space on the stack. */
1283 unsigned long pad0[6];
1284 #endif
1285 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/serial.h linux-libc-headers-2.6.8.0/include/asm-mips/serial.h
1286 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/serial.h 2004-08-18 13:15:41.000000000 -0500
1287 +++ linux-libc-headers-2.6.8.0/include/asm-mips/serial.h 2004-08-26 13:21:37.000000000 -0500
1288 @@ -68,7 +68,7 @@
1290 #define _JAZZ_SERIAL_INIT(int, base) \
1291 { .baud_base = JAZZ_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS, \
1292 - .iomem_base = (u8 *) base, .iomem_reg_shift = 0, \
1293 + .iomem_base = (__u8 *) base, .iomem_reg_shift = 0, \
1294 .io_type = SERIAL_IO_MEM }
1295 #define JAZZ_SERIAL_PORT_DEFNS \
1296 _JAZZ_SERIAL_INIT(JAZZ_SERIAL1_IRQ, JAZZ_SERIAL1_BASE), \
1297 @@ -243,7 +243,7 @@
1298 #define _JAGUAR_ATX_SERIAL_INIT(int, base) \
1299 { baud_base: JAGUAR_ATX_BASE_BAUD, irq: int, \
1300 flags: (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
1301 - iomem_base: (u8 *) base, iomem_reg_shift: 2, \
1302 + iomem_base: (__u8 *) base, iomem_reg_shift: 2, \
1303 io_type: SERIAL_IO_MEM }
1304 #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \
1305 _JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
1306 @@ -260,7 +260,7 @@
1308 #define _OCELOT_SERIAL_INIT(int, base) \
1309 { .baud_base = OCELOT_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS, \
1310 - .iomem_base = (u8 *) base, .iomem_reg_shift = 2, \
1311 + .iomem_base = (__u8 *) base, .iomem_reg_shift = 2, \
1312 .io_type = SERIAL_IO_MEM }
1313 #define MOMENCO_OCELOT_SERIAL_PORT_DEFNS \
1314 _OCELOT_SERIAL_INIT(OCELOT_SERIAL1_IRQ, OCELOT_SERIAL1_BASE)
1315 @@ -281,7 +281,7 @@
1317 #define _OCELOT_G_SERIAL_INIT(int, base) \
1318 { .baud_base = OCELOT_G_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,\
1319 - .iomem_base = (u8 *) base, .iomem_reg_shift = 2, \
1320 + .iomem_base = (__u8 *) base, .iomem_reg_shift = 2, \
1321 .io_type = SERIAL_IO_MEM }
1322 #define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS \
1323 _OCELOT_G_SERIAL_INIT(OCELOT_G_SERIAL1_IRQ, OCELOT_G_SERIAL1_BASE)
1324 @@ -303,7 +303,7 @@
1325 { .baud_base = OCELOT_C_BASE_BAUD, \
1326 .irq = (int), \
1327 .flags = STD_COM_FLAGS, \
1328 - .iomem_base = (u8 *) base, \
1329 + .iomem_base = (__u8 *) base, \
1330 .iomem_reg_shift = 2, \
1331 .io_type = SERIAL_IO_MEM \
1332 }
1333 @@ -318,10 +318,10 @@
1334 #include <asm/ddb5xxx/ddb5477.h>
1335 #define DDB5477_SERIAL_PORT_DEFNS \
1336 { .baud_base = BASE_BAUD, .irq = VRC5477_IRQ_UART0, \
1337 - .flags = STD_COM_FLAGS, .iomem_base = (u8*)0xbfa04200, \
1338 + .flags = STD_COM_FLAGS, .iomem_base = (__u8*)0xbfa04200, \
1339 .iomem_reg_shift = 3, .io_type = SERIAL_IO_MEM}, \
1340 { .baud_base = BASE_BAUD, .irq = VRC5477_IRQ_UART1, \
1341 - .flags = STD_COM_FLAGS, .iomem_base = (u8*)0xbfa04240, \
1342 + .flags = STD_COM_FLAGS, .iomem_base = (__u8*)0xbfa04240, \
1343 .iomem_reg_shift = 3, .io_type = SERIAL_IO_MEM},
1344 #else
1345 #define DDB5477_SERIAL_PORT_DEFNS
1346 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/hpc3.h linux-libc-headers-2.6.8.0/include/asm-mips/sgi/hpc3.h
1347 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/hpc3.h 2003-12-15 12:47:03.000000000 -0600
1348 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/hpc3.h 2004-08-26 05:24:34.000000000 -0500
1349 @@ -17,8 +17,8 @@
1351 /* An HPC DMA descriptor. */
1352 struct hpc_dma_desc {
1353 - u32 pbuf; /* physical address of data buffer */
1354 - u32 cntinfo; /* counter and info bits */
1355 + __u32 pbuf; /* physical address of data buffer */
1356 + __u32 cntinfo; /* counter and info bits */
1357 #define HPCDMA_EOX 0x80000000 /* last desc in chain for tx */
1358 #define HPCDMA_EOR 0x80000000 /* last desc in chain for rx */
1359 #define HPCDMA_EOXP 0x40000000 /* end of packet for tx */
1360 @@ -30,15 +30,15 @@
1361 #define HPCDMA_OWN 0x00004000 /* Denotes ring buffer ownership on rx */
1362 #define HPCDMA_BCNT 0x00003fff /* size in bytes of this dma buffer */
1364 - u32 pnext; /* paddr of next hpc_dma_desc if any */
1365 + __u32 pnext; /* paddr of next hpc_dma_desc if any */
1366 };
1368 /* The set of regs for each HPC3 PBUS DMA channel. */
1369 struct hpc3_pbus_dmacregs {
1370 - volatile u32 pbdma_bptr; /* pbus dma channel buffer ptr */
1371 - volatile u32 pbdma_dptr; /* pbus dma channel desc ptr */
1372 - u32 _unused0[0x1000/4 - 2]; /* padding */
1373 - volatile u32 pbdma_ctrl; /* pbus dma channel control register has
1374 + volatile __u32 pbdma_bptr; /* pbus dma channel buffer ptr */
1375 + volatile __u32 pbdma_dptr; /* pbus dma channel desc ptr */
1376 + __u32 _unused0[0x1000/4 - 2]; /* padding */
1377 + volatile __u32 pbdma_ctrl; /* pbus dma channel control register has
1378 * copletely different meaning for read
1379 * compared with write */
1380 /* read */
1381 @@ -55,20 +55,20 @@
1382 #define HPC3_PDMACTRL_FB 0x003f0000 /* Ptr to beginning of fifo */
1383 #define HPC3_PDMACTRL_FE 0x3f000000 /* Ptr to end of fifo */
1385 - u32 _unused1[0x1000/4 - 1]; /* padding */
1386 + __u32 _unused1[0x1000/4 - 1]; /* padding */
1387 };
1389 /* The HPC3 SCSI registers, this does not include external ones. */
1390 struct hpc3_scsiregs {
1391 - volatile u32 cbptr; /* current dma buffer ptr, diagnostic use only */
1392 - volatile u32 ndptr; /* next dma descriptor ptr */
1393 - u32 _unused0[0x1000/4 - 2]; /* padding */
1394 - volatile u32 bcd; /* byte count info */
1395 + volatile __u32 cbptr; /* current dma buffer ptr, diagnostic use only */
1396 + volatile __u32 ndptr; /* next dma descriptor ptr */
1397 + __u32 _unused0[0x1000/4 - 2]; /* padding */
1398 + volatile __u32 bcd; /* byte count info */
1399 #define HPC3_SBCD_BCNTMSK 0x00003fff /* bytes to transfer from/to memory */
1400 #define HPC3_SBCD_XIE 0x00004000 /* Send IRQ when done with cur buf */
1401 #define HPC3_SBCD_EOX 0x00008000 /* Indicates this is last buf in chain */
1403 - volatile u32 ctrl; /* control register */
1404 + volatile __u32 ctrl; /* control register */
1405 #define HPC3_SCTRL_IRQ 0x01 /* IRQ asserted, either dma done or parity */
1406 #define HPC3_SCTRL_ENDIAN 0x02 /* DMA endian mode, 0=big 1=little */
1407 #define HPC3_SCTRL_DIR 0x04 /* DMA direction, 1=dev2mem 0=mem2dev */
1408 @@ -78,9 +78,9 @@
1409 #define HPC3_SCTRL_CRESET 0x40 /* Resets dma channel and external controller */
1410 #define HPC3_SCTRL_PERR 0x80 /* Bad parity on HPC3 iface to scsi controller */
1412 - volatile u32 gfptr; /* current GIO fifo ptr */
1413 - volatile u32 dfptr; /* current device fifo ptr */
1414 - volatile u32 dconfig; /* DMA configuration register */
1415 + volatile __u32 gfptr; /* current GIO fifo ptr */
1416 + volatile __u32 dfptr; /* current device fifo ptr */
1417 + volatile __u32 dconfig; /* DMA configuration register */
1418 #define HPC3_SDCFG_HCLK 0x00001 /* Enable DMA half clock mode */
1419 #define HPC3_SDCFG_D1 0x00006 /* Cycles to spend in D1 state */
1420 #define HPC3_SDCFG_D2 0x00038 /* Cycles to spend in D2 state */
1421 @@ -92,7 +92,7 @@
1422 #define HPC3_SDCFG_POLL 0x08000 /* hd_dreq polarity control */
1423 #define HPC3_SDCFG_ERLY 0x30000 /* hd_dreq behavior control bits */
1425 - volatile u32 pconfig; /* PIO configuration register */
1426 + volatile __u32 pconfig; /* PIO configuration register */
1427 #define HPC3_SPCFG_P3 0x0003 /* Cycles to spend in P3 state */
1428 #define HPC3_SPCFG_P2W 0x001c /* Cycles to spend in P2 state for writes */
1429 #define HPC3_SPCFG_P2R 0x01e0 /* Cycles to spend in P2 state for reads */
1430 @@ -102,21 +102,21 @@
1431 #define HPC3_SPCFG_EPAR 0x4000 /* Enable parity checking for PIO */
1432 #define HPC3_SPCFG_FUJI 0x8000 /* Fujitsu scsi controller mode for faster dma/pio */
1434 - u32 _unused1[0x1000/4 - 6]; /* padding */
1435 + __u32 _unused1[0x1000/4 - 6]; /* padding */
1436 };
1438 /* SEEQ ethernet HPC3 registers, only one seeq per HPC3. */
1439 struct hpc3_ethregs {
1440 /* Receiver registers. */
1441 - volatile u32 rx_cbptr; /* current dma buffer ptr, diagnostic use only */
1442 - volatile u32 rx_ndptr; /* next dma descriptor ptr */
1443 - u32 _unused0[0x1000/4 - 2]; /* padding */
1444 - volatile u32 rx_bcd; /* byte count info */
1445 + volatile __u32 rx_cbptr; /* current dma buffer ptr, diagnostic use only */
1446 + volatile __u32 rx_ndptr; /* next dma descriptor ptr */
1447 + __u32 _unused0[0x1000/4 - 2]; /* padding */
1448 + volatile __u32 rx_bcd; /* byte count info */
1449 #define HPC3_ERXBCD_BCNTMSK 0x00003fff /* bytes to be sent to memory */
1450 #define HPC3_ERXBCD_XIE 0x20000000 /* HPC3 interrupts cpu at end of this buf */
1451 #define HPC3_ERXBCD_EOX 0x80000000 /* flags this as end of descriptor chain */
1453 - volatile u32 rx_ctrl; /* control register */
1454 + volatile __u32 rx_ctrl; /* control register */
1455 #define HPC3_ERXCTRL_STAT50 0x0000003f /* Receive status reg bits of Seeq8003 */
1456 #define HPC3_ERXCTRL_STAT6 0x00000040 /* Rdonly irq status */
1457 #define HPC3_ERXCTRL_STAT7 0x00000080 /* Rdonlt old/new status bit from Seeq */
1458 @@ -125,15 +125,15 @@
1459 #define HPC3_ERXCTRL_AMASK 0x00000400 /* Tells if ACTIVE inhibits PIO's to hpc3 */
1460 #define HPC3_ERXCTRL_RBO 0x00000800 /* Receive buffer overflow if set to 1 */
1462 - volatile u32 rx_gfptr; /* current GIO fifo ptr */
1463 - volatile u32 rx_dfptr; /* current device fifo ptr */
1464 - u32 _unused1; /* padding */
1465 - volatile u32 rx_reset; /* reset register */
1466 + volatile __u32 rx_gfptr; /* current GIO fifo ptr */
1467 + volatile __u32 rx_dfptr; /* current device fifo ptr */
1468 + __u32 _unused1; /* padding */
1469 + volatile __u32 rx_reset; /* reset register */
1470 #define HPC3_ERXRST_CRESET 0x1 /* Reset dma channel and external controller */
1471 #define HPC3_ERXRST_CLRIRQ 0x2 /* Clear channel interrupt */
1472 #define HPC3_ERXRST_LBACK 0x4 /* Enable diagnostic loopback mode of Seeq8003 */
1474 - volatile u32 rx_dconfig; /* DMA configuration register */
1475 + volatile __u32 rx_dconfig; /* DMA configuration register */
1476 #define HPC3_ERXDCFG_D1 0x0000f /* Cycles to spend in D1 state for PIO */
1477 #define HPC3_ERXDCFG_D2 0x000f0 /* Cycles to spend in D2 state for PIO */
1478 #define HPC3_ERXDCFG_D3 0x00f00 /* Cycles to spend in D3 state for PIO */
1479 @@ -143,26 +143,26 @@
1480 #define HPC3_ERXDCFG_FIRQ 0x08000 /* Another bad packet timeout enable */
1481 #define HPC3_ERXDCFG_PTO 0x30000 /* Programmed timeout value for above two */
1483 - volatile u32 rx_pconfig; /* PIO configuration register */
1484 + volatile __u32 rx_pconfig; /* PIO configuration register */
1485 #define HPC3_ERXPCFG_P1 0x000f /* Cycles to spend in P1 state for PIO */
1486 #define HPC3_ERXPCFG_P2 0x00f0 /* Cycles to spend in P2 state for PIO */
1487 #define HPC3_ERXPCFG_P3 0x0f00 /* Cycles to spend in P3 state for PIO */
1488 #define HPC3_ERXPCFG_TST 0x1000 /* Diagnistic ram test feature bit */
1490 - u32 _unused2[0x1000/4 - 8]; /* padding */
1491 + __u32 _unused2[0x1000/4 - 8]; /* padding */
1493 /* Transmitter registers. */
1494 - volatile u32 tx_cbptr; /* current dma buffer ptr, diagnostic use only */
1495 - volatile u32 tx_ndptr; /* next dma descriptor ptr */
1496 - u32 _unused3[0x1000/4 - 2]; /* padding */
1497 - volatile u32 tx_bcd; /* byte count info */
1498 + volatile __u32 tx_cbptr; /* current dma buffer ptr, diagnostic use only */
1499 + volatile __u32 tx_ndptr; /* next dma descriptor ptr */
1500 + __u32 _unused3[0x1000/4 - 2]; /* padding */
1501 + volatile __u32 tx_bcd; /* byte count info */
1502 #define HPC3_ETXBCD_BCNTMSK 0x00003fff /* bytes to be read from memory */
1503 #define HPC3_ETXBCD_ESAMP 0x10000000 /* if set, too late to add descriptor */
1504 #define HPC3_ETXBCD_XIE 0x20000000 /* Interrupt cpu at end of cur desc */
1505 #define HPC3_ETXBCD_EOP 0x40000000 /* Last byte of cur buf is end of packet */
1506 #define HPC3_ETXBCD_EOX 0x80000000 /* This buf is the end of desc chain */
1508 - volatile u32 tx_ctrl; /* control register */
1509 + volatile __u32 tx_ctrl; /* control register */
1510 #define HPC3_ETXCTRL_STAT30 0x0000000f /* Rdonly copy of seeq tx stat reg */
1511 #define HPC3_ETXCTRL_STAT4 0x00000010 /* Indicate late collision occurred */
1512 #define HPC3_ETXCTRL_STAT75 0x000000e0 /* Rdonly irq status from seeq */
1513 @@ -170,9 +170,9 @@
1514 #define HPC3_ETXCTRL_ACTIVE 0x00000200 /* DMA tx channel is active */
1515 #define HPC3_ETXCTRL_AMASK 0x00000400 /* Indicates ACTIVE inhibits PIO's */
1517 - volatile u32 tx_gfptr; /* current GIO fifo ptr */
1518 - volatile u32 tx_dfptr; /* current device fifo ptr */
1519 - u32 _unused4[0x1000/4 - 4]; /* padding */
1520 + volatile __u32 tx_gfptr; /* current GIO fifo ptr */
1521 + volatile __u32 tx_dfptr; /* current device fifo ptr */
1522 + __u32 _unused4[0x1000/4 - 4]; /* padding */
1523 };
1525 struct hpc3_regs {
1526 @@ -188,7 +188,7 @@
1527 /* Here are where the hpc3 fifo's can be directly accessed
1528 * via PIO accesses. Under normal operation we never stick
1529 * our grubby paws in here so it's just padding. */
1530 - u32 _unused0[0x18000/4];
1531 + __u32 _unused0[0x18000/4];
1533 /* HPC3 irq status regs. Due to a peculiar bug you need to
1534 * look at two different register addresses to get at all of
1535 @@ -197,42 +197,42 @@
1536 * reliably report bits 9:5 of the hpc3 irq status. I told
1537 * you it was a peculiar bug. ;-)
1538 */
1539 - volatile u32 istat0; /* Irq status, only bits <4:0> reliable. */
1540 + volatile __u32 istat0; /* Irq status, only bits <4:0> reliable. */
1541 #define HPC3_ISTAT_PBIMASK 0x0ff /* irq bits for pbus devs 0 --> 7 */
1542 #define HPC3_ISTAT_SC0MASK 0x100 /* irq bit for scsi channel 0 */
1543 #define HPC3_ISTAT_SC1MASK 0x200 /* irq bit for scsi channel 1 */
1545 - volatile u32 gio_misc; /* GIO misc control bits. */
1546 + volatile __u32 gio_misc; /* GIO misc control bits. */
1547 #define HPC3_GIOMISC_ERTIME 0x1 /* Enable external timer real time. */
1548 #define HPC3_GIOMISC_DENDIAN 0x2 /* dma descriptor endian, 1=lit 0=big */
1550 - volatile u32 eeprom; /* EEPROM data reg. */
1551 + volatile __u32 eeprom; /* EEPROM data reg. */
1552 #define HPC3_EEPROM_EPROT 0x01 /* Protect register enable */
1553 #define HPC3_EEPROM_CSEL 0x02 /* Chip select */
1554 #define HPC3_EEPROM_ECLK 0x04 /* EEPROM clock */
1555 #define HPC3_EEPROM_DATO 0x08 /* Data out */
1556 #define HPC3_EEPROM_DATI 0x10 /* Data in */
1558 - volatile u32 istat1; /* Irq status, only bits <9:5> reliable. */
1559 - volatile u32 bestat; /* Bus error interrupt status reg. */
1560 + volatile __u32 istat1; /* Irq status, only bits <9:5> reliable. */
1561 + volatile __u32 bestat; /* Bus error interrupt status reg. */
1562 #define HPC3_BESTAT_BLMASK 0x000ff /* Bus lane where bad parity occurred */
1563 #define HPC3_BESTAT_CTYPE 0x00100 /* Bus cycle type, 0=PIO 1=DMA */
1564 #define HPC3_BESTAT_PIDSHIFT 9
1565 #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */
1567 - u32 _unused1[0x14000/4 - 5]; /* padding */
1568 + __u32 _unused1[0x14000/4 - 5]; /* padding */
1570 /* Now direct PIO per-HPC3 peripheral access to external regs. */
1571 - volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */
1572 - u32 _unused2[0x7c00/4];
1573 - volatile u32 scsi1_ext[256]; /* SCSI channel 1 external regs */
1574 - u32 _unused3[0x7c00/4];
1575 - volatile u32 eth_ext[320]; /* Ethernet external registers */
1576 - u32 _unused4[0x3b00/4];
1577 + volatile __u32 scsi0_ext[256]; /* SCSI channel 0 external regs */
1578 + __u32 _unused2[0x7c00/4];
1579 + volatile __u32 scsi1_ext[256]; /* SCSI channel 1 external regs */
1580 + __u32 _unused3[0x7c00/4];
1581 + volatile __u32 eth_ext[320]; /* Ethernet external registers */
1582 + __u32 _unused4[0x3b00/4];
1584 /* Per-peripheral device external registers and DMA/PIO control. */
1585 - volatile u32 pbus_extregs[16][256];
1586 - volatile u32 pbus_dmacfg[8][128];
1587 + volatile __u32 pbus_extregs[16][256];
1588 + volatile __u32 pbus_dmacfg[8][128];
1589 /* Cycles to spend in D3 for reads */
1590 #define HPC3_DMACFG_D3R_MASK 0x00000001
1591 #define HPC3_DMACFG_D3R_SHIFT 0
1592 @@ -262,7 +262,7 @@
1593 #define HPC3_DMACFG_BURST_SHIFT 22
1594 /* Use live pbus_dreq unsynchronized signal */
1595 #define HPC3_DMACFG_DRQLIVE 0x08000000
1596 - volatile u32 pbus_piocfg[16][64];
1597 + volatile __u32 pbus_piocfg[16][64];
1598 /* Cycles to spend in P2 state for reads */
1599 #define HPC3_PIOCFG_P2R_MASK 0x00001
1600 #define HPC3_PIOCFG_P2R_SHIFT 0
1601 @@ -287,21 +287,21 @@
1602 #define HPC3_PIOCFG_EVENHI 0x80000
1604 /* PBUS PROM control regs. */
1605 - volatile u32 pbus_promwe; /* PROM write enable register */
1606 + volatile __u32 pbus_promwe; /* PROM write enable register */
1607 #define HPC3_PROM_WENAB 0x1 /* Enable writes to the PROM */
1609 - u32 _unused5[0x0800/4 - 1];
1610 - volatile u32 pbus_promswap; /* Chip select swap reg */
1611 + __u32 _unused5[0x0800/4 - 1];
1612 + volatile __u32 pbus_promswap; /* Chip select swap reg */
1613 #define HPC3_PROM_SWAP 0x1 /* invert GIO addr bit to select prom0 or prom1 */
1615 - u32 _unused6[0x0800/4 - 1];
1616 - volatile u32 pbus_gout; /* PROM general purpose output reg */
1617 + __u32 _unused6[0x0800/4 - 1];
1618 + volatile __u32 pbus_gout; /* PROM general purpose output reg */
1619 #define HPC3_PROM_STAT 0x1 /* General purpose status bit in gout */
1621 - u32 _unused7[0x1000/4 - 1];
1622 - volatile u32 rtcregs[14]; /* Dallas clock registers */
1623 - u32 _unused8[50];
1624 - volatile u32 bbram[8192-50-14]; /* Battery backed ram */
1625 + __u32 _unused7[0x1000/4 - 1];
1626 + volatile __u32 rtcregs[14]; /* Dallas clock registers */
1627 + __u32 _unused8[50];
1628 + volatile __u32 bbram[8192-50-14]; /* Battery backed ram */
1629 };
1631 /*
1632 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/ioc.h linux-libc-headers-2.6.8.0/include/asm-mips/sgi/ioc.h
1633 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/ioc.h 2004-03-28 07:51:54.000000000 -0600
1634 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/ioc.h 2004-08-26 05:24:48.000000000 -0500
1635 @@ -22,26 +22,26 @@
1636 */
1638 struct sgioc_uart_regs {
1639 - u8 _ctrl1[3];
1640 - volatile u8 ctrl1;
1641 - u8 _data1[3];
1642 - volatile u8 data1;
1643 - u8 _ctrl2[3];
1644 - volatile u8 ctrl2;
1645 - u8 _data2[3];
1646 - volatile u8 data2;
1647 + __u8 _ctrl1[3];
1648 + volatile __u8 ctrl1;
1649 + __u8 _data1[3];
1650 + volatile __u8 data1;
1651 + __u8 _ctrl2[3];
1652 + volatile __u8 ctrl2;
1653 + __u8 _data2[3];
1654 + volatile __u8 data2;
1655 };
1657 struct sgioc_keyb_regs {
1658 - u8 _data[3];
1659 - volatile u8 data;
1660 - u8 _command[3];
1661 - volatile u8 command;
1662 + __u8 _data[3];
1663 + volatile __u8 data;
1664 + __u8 _command[3];
1665 + volatile __u8 command;
1666 };
1668 struct sgint_regs {
1669 - u8 _istat0[3];
1670 - volatile u8 istat0; /* Interrupt status zero */
1671 + __u8 _istat0[3];
1672 + volatile __u8 istat0; /* Interrupt status zero */
1673 #define SGINT_ISTAT0_FFULL 0x01
1674 #define SGINT_ISTAT0_SCSI0 0x02
1675 #define SGINT_ISTAT0_SCSI1 0x04
1676 @@ -50,10 +50,10 @@
1677 #define SGINT_ISTAT0_PPORT 0x20
1678 #define SGINT_ISTAT0_HPC2 0x40
1679 #define SGINT_ISTAT0_LIO2 0x80
1680 - u8 _imask0[3];
1681 - volatile u8 imask0; /* Interrupt mask zero */
1682 - u8 _istat1[3];
1683 - volatile u8 istat1; /* Interrupt status one */
1684 + __u8 _imask0[3];
1685 + volatile __u8 imask0; /* Interrupt mask zero */
1686 + __u8 _istat1[3];
1687 + volatile __u8 istat1; /* Interrupt status one */
1688 #define SGINT_ISTAT1_ISDNI 0x01
1689 #define SGINT_ISTAT1_PWR 0x02
1690 #define SGINT_ISTAT1_ISDNH 0x04
1691 @@ -62,29 +62,29 @@
1692 #define SGINT_ISTAT1_AFAIL 0x20
1693 #define SGINT_ISTAT1_VIDEO 0x40
1694 #define SGINT_ISTAT1_GIO2 0x80
1695 - u8 _imask1[3];
1696 - volatile u8 imask1; /* Interrupt mask one */
1697 - u8 _vmeistat[3];
1698 - volatile u8 vmeistat; /* VME interrupt status */
1699 - u8 _cmeimask0[3];
1700 - volatile u8 cmeimask0; /* VME interrupt mask zero */
1701 - u8 _cmeimask1[3];
1702 - volatile u8 cmeimask1; /* VME interrupt mask one */
1703 - u8 _cmepol[3];
1704 - volatile u8 cmepol; /* VME polarity */
1705 - u8 _tclear[3];
1706 - volatile u8 tclear;
1707 - u8 _errstat[3];
1708 - volatile u8 errstat; /* Error status reg, reserved on INT2 */
1709 - u32 _unused0[2];
1710 - u8 _tcnt0[3];
1711 - volatile u8 tcnt0; /* counter 0 */
1712 - u8 _tcnt1[3];
1713 - volatile u8 tcnt1; /* counter 1 */
1714 - u8 _tcnt2[3];
1715 - volatile u8 tcnt2; /* counter 2 */
1716 - u8 _tcword[3];
1717 - volatile u8 tcword; /* control word */
1718 + __u8 _imask1[3];
1719 + volatile __u8 imask1; /* Interrupt mask one */
1720 + __u8 _vmeistat[3];
1721 + volatile __u8 vmeistat; /* VME interrupt status */
1722 + __u8 _cmeimask0[3];
1723 + volatile __u8 cmeimask0; /* VME interrupt mask zero */
1724 + __u8 _cmeimask1[3];
1725 + volatile __u8 cmeimask1; /* VME interrupt mask one */
1726 + __u8 _cmepol[3];
1727 + volatile __u8 cmepol; /* VME polarity */
1728 + __u8 _tclear[3];
1729 + volatile __u8 tclear;
1730 + __u8 _errstat[3];
1731 + volatile __u8 errstat; /* Error status reg, reserved on INT2 */
1732 + __u32 _unused0[2];
1733 + __u8 _tcnt0[3];
1734 + volatile __u8 tcnt0; /* counter 0 */
1735 + __u8 _tcnt1[3];
1736 + volatile __u8 tcnt1; /* counter 1 */
1737 + __u8 _tcnt2[3];
1738 + volatile __u8 tcnt2; /* counter 2 */
1739 + __u8 _tcword[3];
1740 + volatile __u8 tcword; /* control word */
1741 #define SGINT_TCWORD_BCD 0x01 /* Use BCD mode for counters */
1742 #define SGINT_TCWORD_MMASK 0x0e /* Mode bitmask. */
1743 #define SGINT_TCWORD_MITC 0x00 /* IRQ on terminal count (doesn't work) */
1744 @@ -115,55 +115,55 @@
1745 #define SGINT_TCSAMP_COUNTER ((SGINT_TIMER_CLOCK / HZ) + 255)
1747 /* We need software copies of these because they are write only. */
1748 -extern u8 sgi_ioc_reset, sgi_ioc_write;
1749 +extern __u8 sgi_ioc_reset, sgi_ioc_write;
1751 struct sgioc_regs {
1752 struct pi1_regs pport;
1753 - u32 _unused0[2];
1754 + __u32 _unused0[2];
1755 struct sgioc_uart_regs serport;
1756 struct sgioc_keyb_regs kbdmouse;
1757 - u8 _gcsel[3];
1758 - volatile u8 gcsel;
1759 - u8 _genctrl[3];
1760 - volatile u8 genctrl;
1761 - u8 _panel[3];
1762 - volatile u8 panel;
1763 + __u8 _gcsel[3];
1764 + volatile __u8 gcsel;
1765 + __u8 _genctrl[3];
1766 + volatile __u8 genctrl;
1767 + __u8 _panel[3];
1768 + volatile __u8 panel;
1769 #define SGIOC_PANEL_POWERON 0x01
1770 #define SGIOC_PANEL_POWERINTR 0x02
1771 #define SGIOC_PANEL_VOLDNINTR 0x10
1772 #define SGIOC_PANEL_VOLDNHOLD 0x20
1773 #define SGIOC_PANEL_VOLUPINTR 0x40
1774 #define SGIOC_PANEL_VOLUPHOLD 0x80
1775 - u32 _unused1;
1776 - u8 _sysid[3];
1777 - volatile u8 sysid;
1778 + __u32 _unused1;
1779 + __u8 _sysid[3];
1780 + volatile __u8 sysid;
1781 #define SGIOC_SYSID_FULLHOUSE 0x01
1782 #define SGIOC_SYSID_BOARDREV(x) ((x & 0xe0) > 5)
1783 #define SGIOC_SYSID_CHIPREV(x) ((x & 0x1e) > 1)
1784 - u32 _unused2;
1785 - u8 _read[3];
1786 - volatile u8 read;
1787 - u32 _unused3;
1788 - u8 _dmasel[3];
1789 - volatile u8 dmasel;
1790 + __u32 _unused2;
1791 + __u8 _read[3];
1792 + volatile __u8 read;
1793 + __u32 _unused3;
1794 + __u8 _dmasel[3];
1795 + volatile __u8 dmasel;
1796 #define SGIOC_DMASEL_SCLK10MHZ 0x00 /* use 10MHZ serial clock */
1797 #define SGIOC_DMASEL_ISDNB 0x01 /* enable isdn B */
1798 #define SGIOC_DMASEL_ISDNA 0x02 /* enable isdn A */
1799 #define SGIOC_DMASEL_PPORT 0x04 /* use parallel DMA */
1800 #define SGIOC_DMASEL_SCLK667MHZ 0x10 /* use 6.67MHZ serial clock */
1801 #define SGIOC_DMASEL_SCLKEXT 0x20 /* use external serial clock */
1802 - u32 _unused4;
1803 - u8 _reset[3];
1804 - volatile u8 reset;
1805 + __u32 _unused4;
1806 + __u8 _reset[3];
1807 + volatile __u8 reset;
1808 #define SGIOC_RESET_PPORT 0x01 /* 0=parport reset, 1=nornal */
1809 #define SGIOC_RESET_KBDMOUSE 0x02 /* 0=kbdmouse reset, 1=normal */
1810 #define SGIOC_RESET_EISA 0x04 /* 0=eisa reset, 1=normal */
1811 #define SGIOC_RESET_ISDN 0x08 /* 0=isdn reset, 1=normal */
1812 #define SGIOC_RESET_LC0OFF 0x10 /* guiness: turn led off (red, else green) */
1813 #define SGIOC_RESET_LC1OFF 0x20 /* guiness: turn led off (green, else amber) */
1814 - u32 _unused5;
1815 - u8 _write[3];
1816 - volatile u8 write;
1817 + __u32 _unused5;
1818 + __u8 _write[3];
1819 + volatile __u8 write;
1820 #define SGIOC_WRITE_NTHRESH 0x01 /* use 4.5db threshhold */
1821 #define SGIOC_WRITE_TPSPEED 0x02 /* use 100ohm TP speed */
1822 #define SGIOC_WRITE_EPSEL 0x04 /* force cable mode: 1=AUI 0=TP */
1823 @@ -172,10 +172,10 @@
1824 #define SGIOC_WRITE_U0AMODE 0x20 /* 1=PC 0=MAC UART mode */
1825 #define SGIOC_WRITE_MLO 0x40 /* 1=4.75V 0=+5V */
1826 #define SGIOC_WRITE_MHI 0x80 /* 1=5.25V 0=+5V */
1827 - u32 _unused6;
1828 + __u32 _unused6;
1829 struct sgint_regs int3;
1830 - u32 _unused7[16];
1831 - volatile u32 extio; /* FullHouse only */
1832 + __u32 _unused7[16];
1833 + volatile __u32 extio; /* FullHouse only */
1834 #define EXTIO_S0_IRQ_3 0x8000 /* S0: vid.vsync */
1835 #define EXTIO_S0_IRQ_2 0x4000 /* S0: gfx.fifofull */
1836 #define EXTIO_S0_IRQ_1 0x2000 /* S0: gfx.int */
1837 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/mc.h linux-libc-headers-2.6.8.0/include/asm-mips/sgi/mc.h
1838 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/mc.h 2003-12-15 12:47:03.000000000 -0600
1839 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/mc.h 2004-08-26 05:25:28.000000000 -0500
1840 @@ -14,8 +14,8 @@
1841 #define _SGI_MC_H
1843 struct sgimc_regs {
1844 - u32 _unused0;
1845 - volatile u32 cpuctrl0; /* CPU control register 0, readwrite */
1846 + __u32 _unused0;
1847 + volatile __u32 cpuctrl0; /* CPU control register 0, readwrite */
1848 #define SGIMC_CCTRL0_REFS 0x0000000f /* REFS mask */
1849 #define SGIMC_CCTRL0_EREFRESH 0x00000010 /* Memory refresh enable */
1850 #define SGIMC_CCTRL0_EPERRGIO 0x00000020 /* GIO parity error enable */
1851 @@ -35,8 +35,8 @@
1852 #define SGIMC_CCTRL0_CMEMBADPAR 0x02000000 /* Generate bad perr from cpu to mem */
1853 #define SGIMC_CCTRL0_R4KNOCHKPARR 0x04000000 /* Don't chk parity on mem data reads */
1854 #define SGIMC_CCTRL0_GIOBTOB 0x08000000 /* Allow GIO back to back writes */
1855 - u32 _unused1;
1856 - volatile u32 cpuctrl1; /* CPU control register 1, readwrite */
1857 + __u32 _unused1;
1858 + volatile __u32 cpuctrl1; /* CPU control register 1, readwrite */
1859 #define SGIMC_CCTRL1_EGIOTIMEO 0x00000010 /* GIO bus timeout enable */
1860 #define SGIMC_CCTRL1_FIXEDEHPC 0x00001000 /* Fixed HPC endianness */
1861 #define SGIMC_CCTRL1_LITTLEHPC 0x00002000 /* Little endian HPC */
1862 @@ -45,33 +45,33 @@
1863 #define SGIMC_CCTRL1_FIXEDEEXP1 0x00010000 /* Fixed EXP1 endianness */
1864 #define SGIMC_CCTRL1_LITTLEEXP1 0x00020000 /* Little endian EXP1 */
1866 - u32 _unused2;
1867 - volatile u32 watchdogt; /* Watchdog reg rdonly, write clears */
1868 + __u32 _unused2;
1869 + volatile __u32 watchdogt; /* Watchdog reg rdonly, write clears */
1871 - u32 _unused3;
1872 - volatile u32 systemid; /* MC system ID register, readonly */
1873 + __u32 _unused3;
1874 + volatile __u32 systemid; /* MC system ID register, readonly */
1875 #define SGIMC_SYSID_MASKREV 0x0000000f /* Revision of MC controller */
1876 #define SGIMC_SYSID_EPRESENT 0x00000010 /* Indicates presence of EISA bus */
1878 - u32 _unused4[3];
1879 - volatile u32 divider; /* Divider reg for RPSS */
1880 + __u32 _unused4[3];
1881 + volatile __u32 divider; /* Divider reg for RPSS */
1883 - u32 _unused5;
1884 - volatile u32 eeprom; /* EEPROM byte reg for r4k */
1885 + __u32 _unused5;
1886 + volatile __u32 eeprom; /* EEPROM byte reg for r4k */
1887 #define SGIMC_EEPROM_PRE 0x00000001 /* eeprom chip PRE pin assertion */
1888 #define SGIMC_EEPROM_CSEL 0x00000002 /* Active high, eeprom chip select */
1889 #define SGIMC_EEPROM_SECLOCK 0x00000004 /* EEPROM serial clock */
1890 #define SGIMC_EEPROM_SDATAO 0x00000008 /* Serial EEPROM data-out */
1891 #define SGIMC_EEPROM_SDATAI 0x00000010 /* Serial EEPROM data-in */
1893 - u32 _unused6[3];
1894 - volatile u32 rcntpre; /* Preload refresh counter */
1895 + __u32 _unused6[3];
1896 + volatile __u32 rcntpre; /* Preload refresh counter */
1898 - u32 _unused7;
1899 - volatile u32 rcounter; /* Readonly refresh counter */
1900 + __u32 _unused7;
1901 + volatile __u32 rcounter; /* Readonly refresh counter */
1903 - u32 _unused8[13];
1904 - volatile u32 giopar; /* Parameter word for GIO64 */
1905 + __u32 _unused8[13];
1906 + volatile __u32 giopar; /* Parameter word for GIO64 */
1907 #define SGIMC_GIOPAR_HPC64 0x00000001 /* HPC talks to GIO using 64-bits */
1908 #define SGIMC_GIOPAR_GFX64 0x00000002 /* GFX talks to GIO using 64-bits */
1909 #define SGIMC_GIOPAR_EXP064 0x00000004 /* EXP(slot0) talks using 64-bits */
1910 @@ -89,36 +89,36 @@
1911 #define SGIMC_GIOPAR_PLINEEXP0 0x00004000 /* EXP(slot0) has pipeline attr */
1912 #define SGIMC_GIOPAR_PLINEEXP1 0x00008000 /* EXP(slot1) has pipeline attr */
1914 - u32 _unused9;
1915 - volatile u32 cputp; /* CPU bus arb time period */
1916 + __u32 _unused9;
1917 + volatile __u32 cputp; /* CPU bus arb time period */
1919 - u32 _unused10[3];
1920 - volatile u32 lbursttp; /* Time period for long bursts */
1921 + __u32 _unused10[3];
1922 + volatile __u32 lbursttp; /* Time period for long bursts */
1924 /* MC chip can drive up to 4 bank 4 SIMMs each. All SIMMs in bank must
1925 * be the same size. The size encoding for supported SIMMs is bellow */
1926 - u32 _unused11[9];
1927 - volatile u32 mconfig0; /* Memory config register zero */
1928 - u32 _unused12;
1929 - volatile u32 mconfig1; /* Memory config register one */
1930 + __u32 _unused11[9];
1931 + volatile __u32 mconfig0; /* Memory config register zero */
1932 + __u32 _unused12;
1933 + volatile __u32 mconfig1; /* Memory config register one */
1934 #define SGIMC_MCONFIG_BASEADDR 0x000000ff /* Base address of bank*/
1935 #define SGIMC_MCONFIG_RMASK 0x00001f00 /* Ram config bitmask */
1936 #define SGIMC_MCONFIG_BVALID 0x00002000 /* Bank is valid */
1937 #define SGIMC_MCONFIG_SBANKS 0x00004000 /* Number of subbanks */
1939 - u32 _unused13;
1940 - volatile u32 cmacc; /* Mem access config for CPU */
1941 - u32 _unused14;
1942 - volatile u32 gmacc; /* Mem access config for GIO */
1943 + __u32 _unused13;
1944 + volatile __u32 cmacc; /* Mem access config for CPU */
1945 + __u32 _unused14;
1946 + volatile __u32 gmacc; /* Mem access config for GIO */
1948 /* This define applies to both cmacc and gmacc registers above. */
1949 #define SGIMC_MACC_ALIASBIG 0x20000000 /* 512MB home for alias */
1951 /* Error address/status regs from GIO and CPU perspectives. */
1952 - u32 _unused15;
1953 - volatile u32 cerr; /* Error address reg for CPU */
1954 - u32 _unused16;
1955 - volatile u32 cstat; /* Status reg for CPU */
1956 + __u32 _unused15;
1957 + volatile __u32 cerr; /* Error address reg for CPU */
1958 + __u32 _unused16;
1959 + volatile __u32 cstat; /* Status reg for CPU */
1960 #define SGIMC_CSTAT_RD 0x00000100 /* read parity error */
1961 #define SGIMC_CSTAT_PAR 0x00000200 /* CPU parity error */
1962 #define SGIMC_CSTAT_ADDR 0x00000400 /* memory bus error bad addr */
1963 @@ -128,10 +128,10 @@
1964 #define SGIMC_CSTAT_PAR_MASK 0x00001f00 /* parity error mask */
1965 #define SGIMC_CSTAT_RD_PAR (SGIMC_CSTAT_RD | SGIMC_CSTAT_PAR)
1967 - u32 _unused17;
1968 - volatile u32 gerr; /* Error address reg for GIO */
1969 - u32 _unused18;
1970 - volatile u32 gstat; /* Status reg for GIO */
1971 + __u32 _unused17;
1972 + volatile __u32 gerr; /* Error address reg for GIO */
1973 + __u32 _unused18;
1974 + volatile __u32 gstat; /* Status reg for GIO */
1975 #define SGIMC_GSTAT_RD 0x00000100 /* read parity error */
1976 #define SGIMC_GSTAT_WR 0x00000200 /* write parity error */
1977 #define SGIMC_GSTAT_TIME 0x00000400 /* GIO bus timed out */
1978 @@ -142,76 +142,76 @@
1979 #define SGIMC_GSTAT_PIO_WR 0x00008000 /* write data parity on pio */
1981 /* Special hard bus locking registers. */
1982 - u32 _unused19;
1983 - volatile u32 syssembit; /* Uni-bit system semaphore */
1984 - u32 _unused20;
1985 - volatile u32 mlock; /* Global GIO memory access lock */
1986 - u32 _unused21;
1987 - volatile u32 elock; /* Locks EISA from GIO accesses */
1988 + __u32 _unused19;
1989 + volatile __u32 syssembit; /* Uni-bit system semaphore */
1990 + __u32 _unused20;
1991 + volatile __u32 mlock; /* Global GIO memory access lock */
1992 + __u32 _unused21;
1993 + volatile __u32 elock; /* Locks EISA from GIO accesses */
1995 /* GIO dma control registers. */
1996 - u32 _unused22[15];
1997 - volatile u32 gio_dma_trans; /* DMA mask to translation GIO addrs */
1998 - u32 _unused23;
1999 - volatile u32 gio_dma_sbits; /* DMA GIO addr substitution bits */
2000 - u32 _unused24;
2001 - volatile u32 dma_intr_cause; /* DMA IRQ cause indicator bits */
2002 - u32 _unused25;
2003 - volatile u32 dma_ctrl; /* Main DMA control reg */
2004 + __u32 _unused22[15];
2005 + volatile __u32 gio_dma_trans; /* DMA mask to translation GIO addrs */
2006 + __u32 _unused23;
2007 + volatile __u32 gio_dma_sbits; /* DMA GIO addr substitution bits */
2008 + __u32 _unused24;
2009 + volatile __u32 dma_intr_cause; /* DMA IRQ cause indicator bits */
2010 + __u32 _unused25;
2011 + volatile __u32 dma_ctrl; /* Main DMA control reg */
2013 /* DMA TLB entry 0 */
2014 - u32 _unused26[5];
2015 - volatile u32 dtlb_hi0;
2016 - u32 _unused27;
2017 - volatile u32 dtlb_lo0;
2018 + __u32 _unused26[5];
2019 + volatile __u32 dtlb_hi0;
2020 + __u32 _unused27;
2021 + volatile __u32 dtlb_lo0;
2023 /* DMA TLB entry 1 */
2024 - u32 _unused28;
2025 - volatile u32 dtlb_hi1;
2026 - u32 _unused29;
2027 - volatile u32 dtlb_lo1;
2028 + __u32 _unused28;
2029 + volatile __u32 dtlb_hi1;
2030 + __u32 _unused29;
2031 + volatile __u32 dtlb_lo1;
2033 /* DMA TLB entry 2 */
2034 - u32 _unused30;
2035 - volatile u32 dtlb_hi2;
2036 - u32 _unused31;
2037 - volatile u32 dtlb_lo2;
2038 + __u32 _unused30;
2039 + volatile __u32 dtlb_hi2;
2040 + __u32 _unused31;
2041 + volatile __u32 dtlb_lo2;
2043 /* DMA TLB entry 3 */
2044 - u32 _unused32;
2045 - volatile u32 dtlb_hi3;
2046 - u32 _unused33;
2047 - volatile u32 dtlb_lo3;
2048 + __u32 _unused32;
2049 + volatile __u32 dtlb_hi3;
2050 + __u32 _unused33;
2051 + volatile __u32 dtlb_lo3;
2053 - u32 _unused34[0x0392];
2054 + __u32 _unused34[0x0392];
2056 - u32 _unused35;
2057 - volatile u32 rpsscounter; /* Chirps at 100ns */
2058 + __u32 _unused35;
2059 + volatile __u32 rpsscounter; /* Chirps at 100ns */
2061 - u32 _unused36[0x1000/4-2*4];
2062 + __u32 _unused36[0x1000/4-2*4];
2064 - u32 _unused37;
2065 - volatile u32 maddronly; /* Address DMA goes at */
2066 - u32 _unused38;
2067 - volatile u32 maddrpdeflts; /* Same as above, plus set defaults */
2068 - u32 _unused39;
2069 - volatile u32 dmasz; /* DMA count */
2070 - u32 _unused40;
2071 - volatile u32 ssize; /* DMA stride size */
2072 - u32 _unused41;
2073 - volatile u32 gmaddronly; /* Set GIO DMA but don't start trans */
2074 - u32 _unused42;
2075 - volatile u32 dmaddnpgo; /* Set GIO DMA addr + start transfer */
2076 - u32 _unused43;
2077 - volatile u32 dmamode; /* DMA mode config bit settings */
2078 - u32 _unused44;
2079 - volatile u32 dmaccount; /* Zoom and byte count for DMA */
2080 - u32 _unused45;
2081 - volatile u32 dmastart; /* Pedal to the metal. */
2082 - u32 _unused46;
2083 - volatile u32 dmarunning; /* DMA op is in progress */
2084 - u32 _unused47;
2085 - volatile u32 maddrdefstart; /* Set dma addr, defaults, and kick it */
2086 + __u32 _unused37;
2087 + volatile __u32 maddronly; /* Address DMA goes at */
2088 + __u32 _unused38;
2089 + volatile __u32 maddrpdeflts; /* Same as above, plus set defaults */
2090 + __u32 _unused39;
2091 + volatile __u32 dmasz; /* DMA count */
2092 + __u32 _unused40;
2093 + volatile __u32 ssize; /* DMA stride size */
2094 + __u32 _unused41;
2095 + volatile __u32 gmaddronly; /* Set GIO DMA but don't start trans */
2096 + __u32 _unused42;
2097 + volatile __u32 dmaddnpgo; /* Set GIO DMA addr + start transfer */
2098 + __u32 _unused43;
2099 + volatile __u32 dmamode; /* DMA mode config bit settings */
2100 + __u32 _unused44;
2101 + volatile __u32 dmaccount; /* Zoom and byte count for DMA */
2102 + __u32 _unused45;
2103 + volatile __u32 dmastart; /* Pedal to the metal. */
2104 + __u32 _unused46;
2105 + volatile __u32 dmarunning; /* DMA op is in progress */
2106 + __u32 _unused47;
2107 + volatile __u32 maddrdefstart; /* Set dma addr, defaults, and kick it */
2108 };
2110 extern struct sgimc_regs *sgimc;
2111 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgiarcs.h linux-libc-headers-2.6.8.0/include/asm-mips/sgiarcs.h
2112 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgiarcs.h 2004-03-28 07:51:52.000000000 -0600
2113 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sgiarcs.h 2004-08-26 05:21:53.000000000 -0500
2114 @@ -164,11 +164,11 @@
2115 /* This prom has a bolixed design. */
2116 struct linux_bigint {
2117 #ifdef __MIPSEL__
2118 - u32 lo;
2119 - s32 hi;
2120 + __u32 lo;
2121 + __s32 hi;
2122 #else /* !(__MIPSEL__) */
2123 - s32 hi;
2124 - u32 lo;
2125 + __s32 hi;
2126 + __u32 lo;
2127 #endif
2128 };
2130 @@ -366,7 +366,7 @@
2131 * Macros for calling a 32-bit ARC implementation from 64-bit code
2132 */
2134 -#if defined(CONFIG_MIPS64) && defined(CONFIG_ARC32)
2135 +#if defined(__mips64) && defined(CONFIG_ARC32)
2137 #define __arc_clobbers \
2138 "$2","$3" /* ... */, "$8","$9","$10","$11", \
2139 @@ -475,10 +475,10 @@
2140 __res; \
2141 })
2143 -#endif /* defined(CONFIG_MIPS64) && defined(CONFIG_ARC32) */
2144 +#endif /* defined(__mips64) && defined(CONFIG_ARC32) */
2146 -#if (defined(CONFIG_MIPS32) && defined(CONFIG_ARC32)) || \
2147 - (defined(CONFIG_MIPS64) && defined(CONFIG_ARC64))
2148 +#if (!defined(__mips64) && defined(CONFIG_ARC32)) || \
2149 + (defined(__mips64) && defined(CONFIG_ARC64))
2151 #define ARC_CALL0(dest) \
2152 ({ long __res; \
2153 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/siginfo.h linux-libc-headers-2.6.8.0/include/asm-mips/siginfo.h
2154 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/siginfo.h 2004-06-09 07:00:41.000000000 -0500
2155 +++ linux-libc-headers-2.6.8.0/include/asm-mips/siginfo.h 2004-08-26 05:14:41.000000000 -0500
2156 @@ -66,10 +66,10 @@
2158 /* SIGPOLL, SIGXFSZ (To do ...) */
2159 struct {
2160 -#ifdef CONFIG_MIPS32
2161 +#ifndef __mips64
2162 int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
2163 #endif
2164 -#ifdef CONFIG_MIPS64
2165 +#ifdef __mips64
2166 long _band; /* POLL_IN, POLL_OUT, POLL_MSG */
2167 #endif
2168 int _fd;
2169 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sim.h linux-libc-headers-2.6.8.0/include/asm-mips/sim.h
2170 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sim.h 2004-03-28 07:51:52.000000000 -0600
2171 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sim.h 2004-08-26 05:17:16.000000000 -0500
2172 @@ -18,7 +18,7 @@
2173 #define __str2(x) #x
2174 #define __str(x) __str2(x)
2176 -#ifdef CONFIG_MIPS32
2177 +#ifndef __mips64
2179 #define save_static_function(symbol) \
2180 __asm__ ( \
2181 @@ -43,9 +43,9 @@
2183 #define nabi_no_regargs
2185 -#endif /* CONFIG_MIPS32 */
2186 +#endif /* ndef __mips64 */
2188 -#ifdef CONFIG_MIPS64
2189 +#ifdef __mips64
2191 #define save_static_function(symbol) \
2192 __asm__ ( \
2193 @@ -78,6 +78,6 @@
2194 unsigned long __dummy6, \
2195 unsigned long __dummy7,
2197 -#endif /* CONFIG_MIPS64 */
2198 +#endif /* __mips64 */
2200 #endif /* _ASM_SIM_H */
2201 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/arch.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/arch.h
2202 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/arch.h 2004-06-09 07:00:42.000000000 -0500
2203 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/arch.h 2004-08-26 05:26:16.000000000 -0500
2204 @@ -17,8 +17,8 @@
2205 #include <asm/sn/sn0/arch.h>
2206 #endif
2208 -typedef u64 hubreg_t;
2209 -typedef u64 nic_t;
2210 +typedef __u64 hubreg_t;
2211 +typedef __u64 nic_t;
2213 #define cputonasid(cpu) (cpu_data[(cpu)].p_nasid)
2214 #define cputoslice(cpu) (cpu_data[(cpu)].p_slice)
2215 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/gda.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/gda.h
2216 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/gda.h 2003-12-15 12:47:02.000000000 -0600
2217 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/gda.h 2004-08-26 05:26:30.000000000 -0500
2218 @@ -44,11 +44,11 @@
2219 #ifndef __ASSEMBLY__
2221 typedef struct gda {
2222 - u32 g_magic; /* GDA magic number */
2223 - u16 g_version; /* Version of this structure */
2224 - u16 g_masterid; /* The NASID:CPUNUM of the master cpu */
2225 - u32 g_promop; /* Passes requests from the kernel to prom */
2226 - u32 g_vds; /* Store the virtual dipswitches here */
2227 + __u32 g_magic; /* GDA magic number */
2228 + __u16 g_version; /* Version of this structure */
2229 + __u16 g_masterid; /* The NASID:CPUNUM of the master cpu */
2230 + __u32 g_promop; /* Passes requests from the kernel to prom */
2231 + __u32 g_vds; /* Store the virtual dipswitches here */
2232 void **g_hooked_norm;/* ptr to pda loc for norm hndlr */
2233 void **g_hooked_utlb;/* ptr to pda loc for utlb hndlr */
2234 void **g_hooked_xtlb;/* ptr to pda loc for xtlb hndlr */
2235 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/ioc3.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/ioc3.h
2236 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/ioc3.h 2003-12-15 12:47:02.000000000 -0600
2237 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/ioc3.h 2004-08-26 05:26:06.000000000 -0500
2238 @@ -8,23 +8,23 @@
2239 /* SUPERIO uart register map */
2240 typedef volatile struct ioc3_uartregs {
2241 union {
2242 - volatile u8 rbr; /* read only, DLAB == 0 */
2243 - volatile u8 thr; /* write only, DLAB == 0 */
2244 - volatile u8 dll; /* DLAB == 1 */
2245 + volatile __u8 rbr; /* read only, DLAB == 0 */
2246 + volatile __u8 thr; /* write only, DLAB == 0 */
2247 + volatile __u8 dll; /* DLAB == 1 */
2248 } u1;
2249 union {
2250 - volatile u8 ier; /* DLAB == 0 */
2251 - volatile u8 dlm; /* DLAB == 1 */
2252 + volatile __u8 ier; /* DLAB == 0 */
2253 + volatile __u8 dlm; /* DLAB == 1 */
2254 } u2;
2255 union {
2256 - volatile u8 iir; /* read only */
2257 - volatile u8 fcr; /* write only */
2258 + volatile __u8 iir; /* read only */
2259 + volatile __u8 fcr; /* write only */
2260 } u3;
2261 - volatile u8 iu_lcr;
2262 - volatile u8 iu_mcr;
2263 - volatile u8 iu_lsr;
2264 - volatile u8 iu_msr;
2265 - volatile u8 iu_scr;
2266 + volatile __u8 iu_lcr;
2267 + volatile __u8 iu_mcr;
2268 + volatile __u8 iu_lsr;
2269 + volatile __u8 iu_msr;
2270 + volatile __u8 iu_scr;
2271 } ioc3_uregs_t;
2273 #define iu_rbr u1.rbr
2274 @@ -36,29 +36,29 @@
2275 #define iu_fcr u3.fcr
2277 struct ioc3_sioregs {
2278 - volatile u8 fill[0x141]; /* starts at 0x141 */
2279 + volatile __u8 fill[0x141]; /* starts at 0x141 */
2281 - volatile u8 uartc;
2282 - volatile u8 kbdcg;
2283 + volatile __u8 uartc;
2284 + volatile __u8 kbdcg;
2286 - volatile u8 fill0[0x150 - 0x142 - 1];
2287 + volatile __u8 fill0[0x150 - 0x142 - 1];
2289 - volatile u8 pp_data;
2290 - volatile u8 pp_dsr;
2291 - volatile u8 pp_dcr;
2292 + volatile __u8 pp_data;
2293 + volatile __u8 pp_dsr;
2294 + volatile __u8 pp_dcr;
2296 - volatile u8 fill1[0x158 - 0x152 - 1];
2297 + volatile __u8 fill1[0x158 - 0x152 - 1];
2299 - volatile u8 pp_fifa;
2300 - volatile u8 pp_cfgb;
2301 - volatile u8 pp_ecr;
2302 + volatile __u8 pp_fifa;
2303 + volatile __u8 pp_cfgb;
2304 + volatile __u8 pp_ecr;
2306 - volatile u8 fill2[0x168 - 0x15a - 1];
2307 + volatile __u8 fill2[0x168 - 0x15a - 1];
2309 - volatile u8 rtcad;
2310 - volatile u8 rtcdat;
2311 + volatile __u8 rtcad;
2312 + volatile __u8 rtcdat;
2314 - volatile u8 fill3[0x170 - 0x169 - 1];
2315 + volatile __u8 fill3[0x170 - 0x169 - 1];
2317 struct ioc3_uartregs uartb; /* 0x20170 */
2318 struct ioc3_uartregs uarta; /* 0x20178 */
2319 @@ -66,103 +66,103 @@
2321 /* Register layout of IOC3 in configuration space. */
2322 struct ioc3 {
2323 - volatile u32 pad0[7]; /* 0x00000 */
2324 - volatile u32 sio_ir; /* 0x0001c */
2325 - volatile u32 sio_ies; /* 0x00020 */
2326 - volatile u32 sio_iec; /* 0x00024 */
2327 - volatile u32 sio_cr; /* 0x00028 */
2328 - volatile u32 int_out; /* 0x0002c */
2329 - volatile u32 mcr; /* 0x00030 */
2330 + volatile __u32 pad0[7]; /* 0x00000 */
2331 + volatile __u32 sio_ir; /* 0x0001c */
2332 + volatile __u32 sio_ies; /* 0x00020 */
2333 + volatile __u32 sio_iec; /* 0x00024 */
2334 + volatile __u32 sio_cr; /* 0x00028 */
2335 + volatile __u32 int_out; /* 0x0002c */
2336 + volatile __u32 mcr; /* 0x00030 */
2338 /* General Purpose I/O registers */
2339 - volatile u32 gpcr_s; /* 0x00034 */
2340 - volatile u32 gpcr_c; /* 0x00038 */
2341 - volatile u32 gpdr; /* 0x0003c */
2342 - volatile u32 gppr_0; /* 0x00040 */
2343 - volatile u32 gppr_1; /* 0x00044 */
2344 - volatile u32 gppr_2; /* 0x00048 */
2345 - volatile u32 gppr_3; /* 0x0004c */
2346 - volatile u32 gppr_4; /* 0x00050 */
2347 - volatile u32 gppr_5; /* 0x00054 */
2348 - volatile u32 gppr_6; /* 0x00058 */
2349 - volatile u32 gppr_7; /* 0x0005c */
2350 - volatile u32 gppr_8; /* 0x00060 */
2351 - volatile u32 gppr_9; /* 0x00064 */
2352 - volatile u32 gppr_10; /* 0x00068 */
2353 - volatile u32 gppr_11; /* 0x0006c */
2354 - volatile u32 gppr_12; /* 0x00070 */
2355 - volatile u32 gppr_13; /* 0x00074 */
2356 - volatile u32 gppr_14; /* 0x00078 */
2357 - volatile u32 gppr_15; /* 0x0007c */
2358 + volatile __u32 gpcr_s; /* 0x00034 */
2359 + volatile __u32 gpcr_c; /* 0x00038 */
2360 + volatile __u32 gpdr; /* 0x0003c */
2361 + volatile __u32 gppr_0; /* 0x00040 */
2362 + volatile __u32 gppr_1; /* 0x00044 */
2363 + volatile __u32 gppr_2; /* 0x00048 */
2364 + volatile __u32 gppr_3; /* 0x0004c */
2365 + volatile __u32 gppr_4; /* 0x00050 */
2366 + volatile __u32 gppr_5; /* 0x00054 */
2367 + volatile __u32 gppr_6; /* 0x00058 */
2368 + volatile __u32 gppr_7; /* 0x0005c */
2369 + volatile __u32 gppr_8; /* 0x00060 */
2370 + volatile __u32 gppr_9; /* 0x00064 */
2371 + volatile __u32 gppr_10; /* 0x00068 */
2372 + volatile __u32 gppr_11; /* 0x0006c */
2373 + volatile __u32 gppr_12; /* 0x00070 */
2374 + volatile __u32 gppr_13; /* 0x00074 */
2375 + volatile __u32 gppr_14; /* 0x00078 */
2376 + volatile __u32 gppr_15; /* 0x0007c */
2378 /* Parallel Port Registers */
2379 - volatile u32 ppbr_h_a; /* 0x00080 */
2380 - volatile u32 ppbr_l_a; /* 0x00084 */
2381 - volatile u32 ppcr_a; /* 0x00088 */
2382 - volatile u32 ppcr; /* 0x0008c */
2383 - volatile u32 ppbr_h_b; /* 0x00090 */
2384 - volatile u32 ppbr_l_b; /* 0x00094 */
2385 - volatile u32 ppcr_b; /* 0x00098 */
2386 + volatile __u32 ppbr_h_a; /* 0x00080 */
2387 + volatile __u32 ppbr_l_a; /* 0x00084 */
2388 + volatile __u32 ppcr_a; /* 0x00088 */
2389 + volatile __u32 ppcr; /* 0x0008c */
2390 + volatile __u32 ppbr_h_b; /* 0x00090 */
2391 + volatile __u32 ppbr_l_b; /* 0x00094 */
2392 + volatile __u32 ppcr_b; /* 0x00098 */
2394 /* Keyboard and Mouse Registers */
2395 - volatile u32 km_csr; /* 0x0009c */
2396 - volatile u32 k_rd; /* 0x000a0 */
2397 - volatile u32 m_rd; /* 0x000a4 */
2398 - volatile u32 k_wd; /* 0x000a8 */
2399 - volatile u32 m_wd; /* 0x000ac */
2400 + volatile __u32 km_csr; /* 0x0009c */
2401 + volatile __u32 k_rd; /* 0x000a0 */
2402 + volatile __u32 m_rd; /* 0x000a4 */
2403 + volatile __u32 k_wd; /* 0x000a8 */
2404 + volatile __u32 m_wd; /* 0x000ac */
2406 /* Serial Port Registers */
2407 - volatile u32 sbbr_h; /* 0x000b0 */
2408 - volatile u32 sbbr_l; /* 0x000b4 */
2409 - volatile u32 sscr_a; /* 0x000b8 */
2410 - volatile u32 stpir_a; /* 0x000bc */
2411 - volatile u32 stcir_a; /* 0x000c0 */
2412 - volatile u32 srpir_a; /* 0x000c4 */
2413 - volatile u32 srcir_a; /* 0x000c8 */
2414 - volatile u32 srtr_a; /* 0x000cc */
2415 - volatile u32 shadow_a; /* 0x000d0 */
2416 - volatile u32 sscr_b; /* 0x000d4 */
2417 - volatile u32 stpir_b; /* 0x000d8 */
2418 - volatile u32 stcir_b; /* 0x000dc */
2419 - volatile u32 srpir_b; /* 0x000e0 */
2420 - volatile u32 srcir_b; /* 0x000e4 */
2421 - volatile u32 srtr_b; /* 0x000e8 */
2422 - volatile u32 shadow_b; /* 0x000ec */
2423 + volatile __u32 sbbr_h; /* 0x000b0 */
2424 + volatile __u32 sbbr_l; /* 0x000b4 */
2425 + volatile __u32 sscr_a; /* 0x000b8 */
2426 + volatile __u32 stpir_a; /* 0x000bc */
2427 + volatile __u32 stcir_a; /* 0x000c0 */
2428 + volatile __u32 srpir_a; /* 0x000c4 */
2429 + volatile __u32 srcir_a; /* 0x000c8 */
2430 + volatile __u32 srtr_a; /* 0x000cc */
2431 + volatile __u32 shadow_a; /* 0x000d0 */
2432 + volatile __u32 sscr_b; /* 0x000d4 */
2433 + volatile __u32 stpir_b; /* 0x000d8 */
2434 + volatile __u32 stcir_b; /* 0x000dc */
2435 + volatile __u32 srpir_b; /* 0x000e0 */
2436 + volatile __u32 srcir_b; /* 0x000e4 */
2437 + volatile __u32 srtr_b; /* 0x000e8 */
2438 + volatile __u32 shadow_b; /* 0x000ec */
2440 /* Ethernet Registers */
2441 - volatile u32 emcr; /* 0x000f0 */
2442 - volatile u32 eisr; /* 0x000f4 */
2443 - volatile u32 eier; /* 0x000f8 */
2444 - volatile u32 ercsr; /* 0x000fc */
2445 - volatile u32 erbr_h; /* 0x00100 */
2446 - volatile u32 erbr_l; /* 0x00104 */
2447 - volatile u32 erbar; /* 0x00108 */
2448 - volatile u32 ercir; /* 0x0010c */
2449 - volatile u32 erpir; /* 0x00110 */
2450 - volatile u32 ertr; /* 0x00114 */
2451 - volatile u32 etcsr; /* 0x00118 */
2452 - volatile u32 ersr; /* 0x0011c */
2453 - volatile u32 etcdc; /* 0x00120 */
2454 - volatile u32 ebir; /* 0x00124 */
2455 - volatile u32 etbr_h; /* 0x00128 */
2456 - volatile u32 etbr_l; /* 0x0012c */
2457 - volatile u32 etcir; /* 0x00130 */
2458 - volatile u32 etpir; /* 0x00134 */
2459 - volatile u32 emar_h; /* 0x00138 */
2460 - volatile u32 emar_l; /* 0x0013c */
2461 - volatile u32 ehar_h; /* 0x00140 */
2462 - volatile u32 ehar_l; /* 0x00144 */
2463 - volatile u32 micr; /* 0x00148 */
2464 - volatile u32 midr_r; /* 0x0014c */
2465 - volatile u32 midr_w; /* 0x00150 */
2466 - volatile u32 pad1[(0x20000 - 0x00154) / 4];
2467 + volatile __u32 emcr; /* 0x000f0 */
2468 + volatile __u32 eisr; /* 0x000f4 */
2469 + volatile __u32 eier; /* 0x000f8 */
2470 + volatile __u32 ercsr; /* 0x000fc */
2471 + volatile __u32 erbr_h; /* 0x00100 */
2472 + volatile __u32 erbr_l; /* 0x00104 */
2473 + volatile __u32 erbar; /* 0x00108 */
2474 + volatile __u32 ercir; /* 0x0010c */
2475 + volatile __u32 erpir; /* 0x00110 */
2476 + volatile __u32 ertr; /* 0x00114 */
2477 + volatile __u32 etcsr; /* 0x00118 */
2478 + volatile __u32 ersr; /* 0x0011c */
2479 + volatile __u32 etcdc; /* 0x00120 */
2480 + volatile __u32 ebir; /* 0x00124 */
2481 + volatile __u32 etbr_h; /* 0x00128 */
2482 + volatile __u32 etbr_l; /* 0x0012c */
2483 + volatile __u32 etcir; /* 0x00130 */
2484 + volatile __u32 etpir; /* 0x00134 */
2485 + volatile __u32 emar_h; /* 0x00138 */
2486 + volatile __u32 emar_l; /* 0x0013c */
2487 + volatile __u32 ehar_h; /* 0x00140 */
2488 + volatile __u32 ehar_l; /* 0x00144 */
2489 + volatile __u32 micr; /* 0x00148 */
2490 + volatile __u32 midr_r; /* 0x0014c */
2491 + volatile __u32 midr_w; /* 0x00150 */
2492 + volatile __u32 pad1[(0x20000 - 0x00154) / 4];
2494 /* SuperIO Registers XXX */
2495 struct ioc3_sioregs sregs; /* 0x20000 */
2496 - volatile u32 pad2[(0x40000 - 0x20180) / 4];
2497 + volatile __u32 pad2[(0x40000 - 0x20180) / 4];
2499 /* SSRAM Diagnostic Access */
2500 - volatile u32 ssram[(0x80000 - 0x40000) / 4];
2501 + volatile __u32 ssram[(0x80000 - 0x40000) / 4];
2503 /* Bytebus device offsets
2504 0x80000 - Access to the generic devices selected with DEV0
2505 @@ -179,8 +179,8 @@
2506 * Ethernet RX Buffer
2507 */
2508 struct ioc3_erxbuf {
2509 - u32 w0; /* first word (valid,bcnt,cksum) */
2510 - u32 err; /* second word various errors */
2511 + __u32 w0; /* first word (valid,bcnt,cksum) */
2512 + __u32 err; /* second word various errors */
2513 /* next comes n bytes of padding */
2514 /* then the received ethernet frame itself */
2515 };
2516 @@ -208,11 +208,11 @@
2517 */
2518 #define ETXD_DATALEN 104
2519 struct ioc3_etxd {
2520 - u32 cmd; /* command field */
2521 - u32 bufcnt; /* buffer counts field */
2522 - u64 p1; /* buffer pointer 1 */
2523 - u64 p2; /* buffer pointer 2 */
2524 - u8 data[ETXD_DATALEN]; /* opt. tx data */
2525 + __u32 cmd; /* command field */
2526 + __u32 bufcnt; /* buffer counts field */
2527 + __u64 p1; /* buffer pointer 1 */
2528 + __u64 p2; /* buffer pointer 2 */
2529 + __u8 data[ETXD_DATALEN]; /* opt. tx data */
2530 };
2532 #define ETXD_BYTECNT_MASK 0x000007ff /* total byte count */
2533 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/klconfig.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/klconfig.h
2534 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/klconfig.h 2004-03-28 07:51:55.000000000 -0600
2535 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/klconfig.h 2004-08-26 05:26:13.000000000 -0500
2536 @@ -64,9 +64,9 @@
2537 #define KLCFGINFO_MAGIC 0xbeedbabe
2539 #ifdef FRUTEST
2540 -typedef u64 klconf_off_t;
2541 +typedef __u64 klconf_off_t;
2542 #else
2543 -typedef s32 klconf_off_t;
2544 +typedef __s32 klconf_off_t;
2545 #endif
2547 /*
2548 @@ -160,8 +160,8 @@
2549 /* Functions/macros needed to use this structure */
2551 typedef struct kl_config_hdr {
2552 - u64 ch_magic; /* set this to KLCFGINFO_MAGIC */
2553 - u32 ch_version; /* structure version number */
2554 + __u64 ch_magic; /* set this to KLCFGINFO_MAGIC */
2555 + __u32 ch_version; /* structure version number */
2556 klconf_off_t ch_malloc_hdr_off; /* offset of ch_malloc_hdr */
2557 klconf_off_t ch_cons_off; /* offset of ch_cons */
2558 klconf_off_t ch_board_info; /* the link list of boards */
2559 @@ -609,14 +609,14 @@
2561 /* Info holders for various hardware components */
2563 -typedef u64 *pci_t;
2564 -typedef u64 *vmeb_t;
2565 -typedef u64 *vmed_t;
2566 -typedef u64 *fddi_t;
2567 -typedef u64 *scsi_t;
2568 -typedef u64 *mio_t;
2569 -typedef u64 *graphics_t;
2570 -typedef u64 *router_t;
2571 +typedef __u64 *pci_t;
2572 +typedef __u64 *vmeb_t;
2573 +typedef __u64 *vmed_t;
2574 +typedef __u64 *fddi_t;
2575 +typedef __u64 *scsi_t;
2576 +typedef __u64 *mio_t;
2577 +typedef __u64 *graphics_t;
2578 +typedef __u64 *router_t;
2580 /*
2581 * The port info in ip27_cfg area translates to a lboart_t in the
2582 @@ -659,7 +659,7 @@
2583 klport_t hub_port; /* hub is connected to this */
2584 nic_t hub_box_nic; /* nic of containing box */
2585 klconf_off_t hub_mfg_nic; /* MFG NIC string */
2586 - u64 hub_speed; /* Speed of hub in HZ */
2587 + __u64 hub_speed; /* Speed of hub in HZ */
2588 } klhub_t ;
2590 typedef struct klhub_uart_s { /* HUB */
2591 @@ -716,8 +716,8 @@
2592 #define MAX_PCI_SLOTS 8
2594 typedef struct klpci_device_s {
2595 - s32 pci_device_id; /* 32 bits of vendor/device ID. */
2596 - s32 pci_device_pad; /* 32 bits of padding. */
2597 + __s32 pci_device_id; /* 32 bits of vendor/device ID. */
2598 + __s32 pci_device_pad; /* 32 bits of padding. */
2599 } klpci_device_t;
2601 #define BRIDGE_STRUCT_VERSION 2
2602 @@ -767,7 +767,7 @@
2603 nic_t rou_box_nic ; /* nic of the containing module */
2604 klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */
2605 klconf_off_t rou_mfg_nic ; /* MFG NIC string */
2606 - u64 rou_vector; /* vector from master node */
2607 + __u64 rou_vector; /* vector from master node */
2608 } klrou_t ;
2610 /*
2611 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/kldir.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/kldir.h
2612 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/kldir.h 2004-01-17 17:03:49.000000000 -0600
2613 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/kldir.h 2004-08-26 05:26:25.000000000 -0500
2614 @@ -210,7 +210,7 @@
2616 #ifndef __ASSEMBLY__
2617 typedef struct kldir_ent_s {
2618 - u64 magic; /* Indicates validity of entry */
2619 + __u64 magic; /* Indicates validity of entry */
2620 off_t offset; /* Offset from start of node space */
2621 #if defined(CONFIG_SGI_IO) /* FIXME */
2622 __psunsigned_t pointer; /* Pointer to area in some cases */
2623 @@ -218,7 +218,7 @@
2624 unsigned long pointer; /* Pointer to area in some cases */
2625 #endif
2626 size_t size; /* Size in bytes */
2627 - u64 count; /* Repeat count if array, 1 if not */
2628 + __u64 count; /* Repeat count if array, 1 if not */
2629 size_t stride; /* Stride if array, 0 if not */
2630 char rsvd[16]; /* Pad entry to 0x40 bytes */
2631 /* NOTE: These 16 bytes are used in the Partition KLDIR
2632 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/launch.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/launch.h
2633 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/launch.h 2004-01-17 17:03:49.000000000 -0600
2634 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/launch.h 2004-08-26 05:25:52.000000000 -0500
2635 @@ -62,14 +62,14 @@
2636 #ifndef __ASSEMBLY__
2638 typedef int launch_state_t;
2639 -typedef void (*launch_proc_t)(u64 call_parm);
2640 +typedef void (*launch_proc_t)(__u64 call_parm);
2642 typedef struct launch_s {
2643 - volatile u64 magic; /* Magic number */
2644 - volatile u64 busy; /* Slave currently active */
2645 + volatile __u64 magic; /* Magic number */
2646 + volatile __u64 busy; /* Slave currently active */
2647 volatile launch_proc_t call_addr; /* Func. for slave to call */
2648 - volatile u64 call_addr_c; /* 1's complement of call_addr*/
2649 - volatile u64 call_parm; /* Single parm passed to call*/
2650 + volatile __u64 call_addr_c; /* 1's complement of call_addr*/
2651 + volatile __u64 call_parm; /* Single parm passed to call*/
2652 volatile void *stack_addr; /* Stack pointer for slave function */
2653 volatile void *gp_addr; /* Global pointer for slave func. */
2654 volatile char *bevutlb;/* Address of bev utlb ex handler */
2655 @@ -84,7 +84,7 @@
2657 #define LAUNCH_SLAVE (*(void (*)(int nasid, int cpu, \
2658 launch_proc_t call_addr, \
2659 - u64 call_parm, \
2660 + __u64 call_parm, \
2661 void *stack_addr, \
2662 void *gp_addr)) \
2663 IP27PROM_LAUNCHSLAVE)
2664 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubio.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubio.h
2665 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubio.h 2003-12-15 12:47:02.000000000 -0600
2666 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubio.h 2004-08-26 05:27:21.000000000 -0500
2667 @@ -172,9 +172,9 @@
2668 #ifndef __ASSEMBLY__
2670 typedef union hubii_wid_u {
2671 - u64 wid_reg_value;
2672 + __u64 wid_reg_value;
2673 struct {
2674 - u64 wid_rsvd: 32, /* unused */
2675 + __u64 wid_rsvd: 32, /* unused */
2676 wid_rev_num: 4, /* revision number */
2677 wid_part_num: 16, /* the widget type: hub=c101 */
2678 wid_mfg_num: 11, /* Manufacturer id (IBM) */
2679 @@ -184,9 +184,9 @@
2682 typedef union hubii_wcr_u {
2683 - u64 wcr_reg_value;
2684 + __u64 wcr_reg_value;
2685 struct {
2686 - u64 wcr_rsvd: 41, /* unused */
2687 + __u64 wcr_rsvd: 41, /* unused */
2688 wcr_e_thresh: 5, /* elasticity threshold */
2689 wcr_dir_con: 1, /* widget direct connect */
2690 wcr_f_bad_pkt: 1, /* Force bad llp pkt enable */
2691 @@ -200,9 +200,9 @@
2692 #define iwcr_dir_con wcr_fields_s.wcr_dir_con
2694 typedef union hubii_wstat_u {
2695 - u64 reg_value;
2696 + __u64 reg_value;
2697 struct {
2698 - u64 rsvd1: 31,
2699 + __u64 rsvd1: 31,
2700 crazy: 1, /* Crazy bit */
2701 rsvd2: 8,
2702 llp_tx_cnt: 8, /* LLP Xmit retry counter */
2703 @@ -217,9 +217,9 @@
2706 typedef union hubii_ilcsr_u {
2707 - u64 icsr_reg_value;
2708 + __u64 icsr_reg_value;
2709 struct {
2710 - u64 icsr_rsvd: 22, /* unused */
2711 + __u64 icsr_rsvd: 22, /* unused */
2712 icsr_max_burst: 10, /* max burst */
2713 icsr_rsvd4: 6, /* reserved */
2714 icsr_max_retry: 10, /* max retry */
2715 @@ -237,9 +237,9 @@
2718 typedef union hubii_iowa_u {
2719 - u64 iowa_reg_value;
2720 + __u64 iowa_reg_value;
2721 struct {
2722 - u64 iowa_rsvd: 48, /* unused */
2723 + __u64 iowa_rsvd: 48, /* unused */
2724 iowa_wxoac: 8, /* xtalk widget access bits */
2725 iowa_rsvd1: 7, /* xtalk widget access bits */
2726 iowa_w0oac: 1; /* xtalk widget access bits */
2727 @@ -247,9 +247,9 @@
2728 } hubii_iowa_t;
2730 typedef union hubii_iiwa_u {
2731 - u64 iiwa_reg_value;
2732 + __u64 iiwa_reg_value;
2733 struct {
2734 - u64 iiwa_rsvd: 48, /* unused */
2735 + __u64 iiwa_rsvd: 48, /* unused */
2736 iiwa_wxiac: 8, /* hub wid access bits */
2737 iiwa_rsvd1: 7, /* reserved */
2738 iiwa_w0iac: 1; /* hub wid0 access */
2739 @@ -257,9 +257,9 @@
2740 } hubii_iiwa_t;
2742 typedef union hubii_illr_u {
2743 - u64 illr_reg_value;
2744 + __u64 illr_reg_value;
2745 struct {
2746 - u64 illr_rsvd: 32, /* unused */
2747 + __u64 illr_rsvd: 32, /* unused */
2748 illr_cb_cnt: 16, /* checkbit error count */
2749 illr_sn_cnt: 16; /* sequence number count */
2750 } illr_fields_s;
2751 @@ -271,9 +271,9 @@
2752 /* io_perf_sel allows the caller to specify what tests will be
2753 performed */
2754 typedef union io_perf_sel {
2755 - u64 perf_sel_reg;
2756 + __u64 perf_sel_reg;
2757 struct {
2758 - u64 perf_rsvd : 48,
2759 + __u64 perf_rsvd : 48,
2760 perf_icct : 8,
2761 perf_ippr1 : 4,
2762 perf_ippr0 : 4;
2763 @@ -284,9 +284,9 @@
2764 hardware problems there is only one counter, not two. */
2766 typedef union io_perf_cnt {
2767 - u64 perf_cnt;
2768 + __u64 perf_cnt;
2769 struct {
2770 - u64 perf_rsvd1 : 32,
2771 + __u64 perf_rsvd1 : 32,
2772 perf_rsvd2 : 12,
2773 perf_cnt : 20;
2774 } perf_cnt_bits;
2775 @@ -442,9 +442,9 @@
2776 */
2777 #ifndef __ASSEMBLY__
2778 typedef union icrba_u {
2779 - u64 reg_value;
2780 + __u64 reg_value;
2781 struct {
2782 - u64 resvd: 6,
2783 + __u64 resvd: 6,
2784 stall_bte0: 1, /* Stall BTE 0 */
2785 stall_bte1: 1, /* Stall BTE 1 */
2786 error: 1, /* CRB has an error */
2787 @@ -464,10 +464,10 @@
2788 runtime selection of the format based on the REV_ID field of the
2789 NI_STATUS_REV_ID register. */
2790 typedef union h1_icrba_u {
2791 - u64 reg_value;
2792 + __u64 reg_value;
2794 struct {
2795 - u64 resvd: 6,
2796 + __u64 resvd: 6,
2797 unused: 1, /* Unused but RW!! */
2798 error: 1, /* CRB has an error */
2799 ecode: 4, /* Error Code */
2800 @@ -525,9 +525,9 @@
2801 */
2802 #ifndef __ASSEMBLY__
2803 typedef union icrbb_u {
2804 - u64 reg_value;
2805 + __u64 reg_value;
2806 struct {
2807 - u64 rsvd1: 5,
2808 + __u64 rsvd1: 5,
2809 btenum: 1, /* BTE to which entry belongs to */
2810 cohtrans: 1, /* Coherent transaction */
2811 xtsize: 2, /* Xtalk operation size
2812 @@ -567,9 +567,9 @@
2813 runtime selection of the format based on the REV_ID field of the
2814 NI_STATUS_REV_ID register. */
2815 typedef union h1_icrbb_u {
2816 - u64 reg_value;
2817 + __u64 reg_value;
2818 struct {
2819 - u64 rsvd1: 5,
2820 + __u64 rsvd1: 5,
2821 btenum: 1, /* BTE to which entry belongs to */
2822 cohtrans: 1, /* Coherent transaction */
2823 xtsize: 2, /* Xtalk operation size
2824 @@ -683,9 +683,9 @@
2825 #ifndef __ASSEMBLY__
2827 typedef union icrbc_s {
2828 - u64 reg_value;
2829 + __u64 reg_value;
2830 struct {
2831 - u64 rsvd: 6,
2832 + __u64 rsvd: 6,
2833 sleep: 1,
2834 pricnt: 4, /* Priority count sent with Read req */
2835 pripsc: 4, /* Priority Pre scalar */
2836 @@ -720,9 +720,9 @@
2838 #ifndef __ASSEMBLY__
2839 typedef union icrbd_s {
2840 - u64 reg_value;
2841 + __u64 reg_value;
2842 struct {
2843 - u64 rsvd: 38,
2844 + __u64 rsvd: 38,
2845 toutvld: 1, /* Timeout in progress for this CRB */
2846 ctxtvld: 1, /* Context field below is valid */
2847 rsvd2: 1,
2848 @@ -742,9 +742,9 @@
2851 typedef union hubii_ifdr_u {
2852 - u64 hi_ifdr_value;
2853 + __u64 hi_ifdr_value;
2854 struct {
2855 - u64 ifdr_rsvd: 49,
2856 + __u64 ifdr_rsvd: 49,
2857 ifdr_maxrp: 7,
2858 ifdr_rsvd1: 1,
2859 ifdr_maxrq: 7;
2860 @@ -801,9 +801,9 @@
2861 #ifndef __ASSEMBLY__
2863 typedef union iprte_a {
2864 - u64 entry;
2865 + __u64 entry;
2866 struct {
2867 - u64 rsvd1 : 7, /* Reserved field */
2868 + __u64 rsvd1 : 7, /* Reserved field */
2869 valid : 1, /* Maps to a timeout entry */
2870 rsvd2 : 1,
2871 srcnode : 9, /* Node which did this PIO */
2872 @@ -835,9 +835,9 @@
2873 */
2875 typedef union iprb_u {
2876 - u64 reg_value;
2877 + __u64 reg_value;
2878 struct {
2879 - u64 rsvd1: 15,
2880 + __u64 rsvd1: 15,
2881 error: 1, /* Widget rcvd wr resp pkt w/ error */
2882 ovflow: 5, /* Over flow count. perf measurement */
2883 fire_and_forget: 1, /* Launch Write without response */
2884 @@ -877,9 +877,9 @@
2885 */
2886 #ifndef __ASSEMBLY__
2887 typedef union icrbp_a {
2888 - u64 ip_reg; /* the entire register value */
2889 + __u64 ip_reg; /* the entire register value */
2890 struct {
2891 - u64 error: 1, /* 63, error occurred */
2892 + __u64 error: 1, /* 63, error occurred */
2893 ln_uce: 1, /* 62: uncorrectable memory */
2894 ln_ae: 1, /* 61: protection violation */
2895 ln_werr:1, /* 60: write access error */
2896 @@ -919,9 +919,9 @@
2898 #ifndef __ASSEMBLY__
2899 typedef union hubii_idsr {
2900 - u64 iin_reg;
2901 + __u64 iin_reg;
2902 struct {
2903 - u64 rsvd1 : 35,
2904 + __u64 rsvd1 : 35,
2905 isent : 1,
2906 rsvd2 : 3,
2907 ienable: 1,
2908 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubmd.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubmd.h
2909 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubmd.h 2004-01-17 17:03:49.000000000 -0600
2910 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubmd.h 2004-08-26 05:27:00.000000000 -0500
2911 @@ -541,7 +541,7 @@
2912 */
2914 struct dir_error_reg {
2915 - u64 uce_vld: 1, /* 63: valid directory uce */
2916 + __u64 uce_vld: 1, /* 63: valid directory uce */
2917 ae_vld: 1, /* 62: valid dir prot ecc error */
2918 ce_vld: 1, /* 61: valid correctable ECC err*/
2919 rsvd1: 19, /* 60-42: reserved */
2920 @@ -555,13 +555,13 @@
2921 };
2923 typedef union md_dir_error {
2924 - u64 derr_reg; /* the entire register */
2925 + __u64 derr_reg; /* the entire register */
2926 struct dir_error_reg derr_fmt; /* the register format */
2927 } md_dir_error_t;
2930 struct mem_error_reg {
2931 - u64 uce_vld: 1, /* 63: valid memory uce */
2932 + __u64 uce_vld: 1, /* 63: valid memory uce */
2933 ce_vld: 1, /* 62: valid correctable ECC err*/
2934 rsvd1: 22, /* 61-40: reserved */
2935 bad_syn: 8, /* 39-32: bad mem ecc syndrome */
2936 @@ -573,13 +573,13 @@
2939 typedef union md_mem_error {
2940 - u64 merr_reg; /* the entire register */
2941 + __u64 merr_reg; /* the entire register */
2942 struct mem_error_reg merr_fmt; /* format of the mem_error reg */
2943 } md_mem_error_t;
2946 struct proto_error_reg {
2947 - u64 valid: 1, /* 63: valid protocol error */
2948 + __u64 valid: 1, /* 63: valid protocol error */
2949 rsvd1: 2, /* 62-61: reserved */
2950 initiator:11, /* 60-50: id of request initiator*/
2951 backoff: 2, /* 49-48: backoff control */
2952 @@ -594,7 +594,7 @@
2953 };
2955 typedef union md_proto_error {
2956 - u64 perr_reg; /* the entire register */
2957 + __u64 perr_reg; /* the entire register */
2958 struct proto_error_reg perr_fmt; /* format of the register */
2959 } md_proto_error_t;
2961 @@ -642,7 +642,7 @@
2964 struct md_pdir_high_fmt {
2965 - u64 pd_hi_unused : 16,
2966 + __u64 pd_hi_unused : 16,
2967 pd_hi_bvec : 38,
2968 pd_hi_unused1 : 3,
2969 pd_hi_ecc : 7;
2970 @@ -651,14 +651,14 @@
2972 typedef union md_pdir_high {
2973 /* The 48 bits of standard directory, upper word */
2974 - u64 pd_hi_val;
2975 + __u64 pd_hi_val;
2976 struct md_pdir_high_fmt pd_hi_fmt;
2977 }md_pdir_high_t;
2980 struct md_pdir_low_shared_fmt {
2981 /* The meaning of lower directory, shared */
2982 - u64 pds_lo_unused : 16,
2983 + __u64 pds_lo_unused : 16,
2984 pds_lo_bvec : 26,
2985 pds_lo_cnt : 6,
2986 pds_lo_state : 3,
2987 @@ -670,7 +670,7 @@
2989 struct md_pdir_low_exclusive_fmt {
2990 /* The meaning of lower directory, exclusive */
2991 - u64 pde_lo_unused : 31,
2992 + __u64 pde_lo_unused : 31,
2993 pde_lo_ptr : 11,
2994 pde_lo_unused1 : 6,
2995 pde_lo_state : 3,
2996 @@ -683,7 +683,7 @@
2998 typedef union md_pdir_loent {
2999 /* The 48 bits of premium directory, lower word */
3000 - u64 pd_lo_val;
3001 + __u64 pd_lo_val;
3002 struct md_pdir_low_exclusive_fmt pde_lo_fmt;
3003 struct md_pdir_low_shared_fmt pds_lo_fmt;
3004 }md_pdir_low_t;
3005 @@ -711,25 +711,25 @@
3006 } bddir_entry_t;
3008 typedef struct dir_mem_entry {
3009 - u64 prcpf[MAX_REGIONS];
3010 + __u64 prcpf[MAX_REGIONS];
3011 bddir_entry_t directory_words[MD_PAGE_SIZE/CACHE_SLINE_SIZE];
3012 } dir_mem_entry_t;
3016 typedef union md_perf_sel {
3017 - u64 perf_sel_reg;
3018 + __u64 perf_sel_reg;
3019 struct {
3020 - u64 perf_rsvd : 60,
3021 + __u64 perf_rsvd : 60,
3022 perf_en : 1,
3023 perf_sel : 3;
3024 } perf_sel_bits;
3025 } md_perf_sel_t;
3027 typedef union md_perf_cnt {
3028 - u64 perf_cnt;
3029 + __u64 perf_cnt;
3030 struct {
3031 - u64 perf_rsvd : 44,
3032 + __u64 perf_rsvd : 44,
3033 perf_cnt : 20;
3034 } perf_cnt_bits;
3035 } md_perf_cnt_t;
3036 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubni.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubni.h
3037 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubni.h 2003-12-15 12:47:02.000000000 -0600
3038 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubni.h 2004-08-26 05:26:48.000000000 -0500
3039 @@ -229,9 +229,9 @@
3040 #ifndef __ASSEMBLY__
3042 typedef union hubni_port_error_u {
3043 - u64 nipe_reg_value;
3044 + __u64 nipe_reg_value;
3045 struct {
3046 - u64 nipe_rsvd: 26, /* unused */
3047 + __u64 nipe_rsvd: 26, /* unused */
3048 nipe_lnk_reset: 1, /* link reset */
3049 nipe_intl_err: 1, /* internal error */
3050 nipe_bad_msg: 1, /* bad message */
3051 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubpi.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubpi.h
3052 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubpi.h 2003-12-15 12:47:02.000000000 -0600
3053 +++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubpi.h 2004-08-26 05:26:36.000000000 -0500
3054 @@ -312,7 +312,7 @@
3055 */
3057 struct err_stack_format {
3058 - u64 sk_addr : 33, /* address */
3059 + __u64 sk_addr : 33, /* address */
3060 sk_cmd : 8, /* message command */
3061 sk_crb_sts : 10, /* status from RRB or WRB */
3062 sk_rw_rb : 1, /* RRB == 0, WRB == 1 */
3063 @@ -323,12 +323,12 @@
3064 };
3066 typedef union pi_err_stack {
3067 - u64 pi_stk_word;
3068 + __u64 pi_stk_word;
3069 struct err_stack_format pi_stk_fmt;
3070 } pi_err_stack_t;
3072 struct err_status0_format {
3073 - u64 s0_valid : 1, /* Valid */
3074 + __u64 s0_valid : 1, /* Valid */
3075 s0_ovr_run : 1, /* Overrun, spooled to memory */
3076 s0_addr : 37, /* address */
3077 s0_cmd : 8, /* message command */
3078 @@ -338,12 +338,12 @@
3079 };
3081 typedef union pi_err_stat0 {
3082 - u64 pi_stat0_word;
3083 + __u64 pi_stat0_word;
3084 struct err_status0_format pi_stat0_fmt;
3085 } pi_err_stat0_t;
3087 struct err_status1_format {
3088 - u64 s1_src : 11, /* message source */
3089 + __u64 s1_src : 11, /* message source */
3090 s1_crb_sts : 10, /* status from RRB or WRB */
3091 s1_rw_rb : 1, /* RRB == 0, WRB == 1 */
3092 s1_crb_num : 3, /* WRB (0 to 7) or RRB (0 to 4) */
3093 @@ -353,11 +353,11 @@
3094 };
3096 typedef union pi_err_stat1 {
3097 - u64 pi_stat1_word;
3098 + __u64 pi_stat1_word;
3099 struct err_status1_format pi_stat1_fmt;
3100 } pi_err_stat1_t;
3102 -typedef u64 rtc_time_t;
3103 +typedef __u64 rtc_time_t;
3105 #endif /* !__ASSEMBLY__ */
3107 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/stackframe.h linux-libc-headers-2.6.8.0/include/asm-mips/stackframe.h
3108 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/stackframe.h 2004-08-18 13:15:41.000000000 -0500
3109 +++ linux-libc-headers-2.6.8.0/include/asm-mips/stackframe.h 2004-08-26 05:14:41.000000000 -0500
3110 @@ -25,7 +25,7 @@
3112 .macro SAVE_TEMP
3113 mfhi v1
3114 -#ifdef CONFIG_MIPS32
3115 +#ifndef __mips64
3116 LONG_S $8, PT_R8(sp)
3117 LONG_S $9, PT_R9(sp)
3118 #endif
3119 @@ -55,7 +55,7 @@
3121 #ifdef CONFIG_SMP
3122 .macro get_saved_sp /* SMP variation */
3123 -#ifdef CONFIG_MIPS32
3124 +#ifndef __mips64
3125 mfc0 k0, CP0_CONTEXT
3126 lui k1, %hi(kernelsp)
3127 srl k0, k0, 23
3128 @@ -63,7 +63,7 @@
3129 addu k1, k0
3130 LONG_L k1, %lo(kernelsp)(k1)
3131 #endif
3132 -#ifdef CONFIG_MIPS64
3133 +#ifdef __mips64
3134 MFC0 k1, CP0_CONTEXT
3135 dsra k1, 23
3136 lui k0, %hi(pgd_current)
3137 @@ -76,13 +76,13 @@
3138 .endm
3140 .macro set_saved_sp stackp temp temp2
3141 -#ifdef CONFIG_MIPS32
3142 +#ifndef __mips64
3143 mfc0 \temp, CP0_CONTEXT
3144 srl \temp, 23
3145 sll \temp, 2
3146 LONG_S \stackp, kernelsp(\temp)
3147 #endif
3148 -#ifdef CONFIG_MIPS64
3149 +#ifdef __mips64
3150 lw \temp, TI_CPU(gp)
3151 dsll \temp, 3
3152 lui \temp2, %hi(kernelsp)
3153 @@ -127,7 +127,7 @@
3154 LONG_S $6, PT_R6(sp)
3155 MFC0 v1, CP0_EPC
3156 LONG_S $7, PT_R7(sp)
3157 -#ifdef CONFIG_MIPS64
3158 +#ifdef __mips64
3159 LONG_S $8, PT_R8(sp)
3160 LONG_S $9, PT_R9(sp)
3161 #endif
3162 @@ -156,7 +156,7 @@
3164 .macro RESTORE_TEMP
3165 LONG_L $24, PT_LO(sp)
3166 -#ifdef CONFIG_MIPS32
3167 +#ifndef __mips64
3168 LONG_L $8, PT_R8(sp)
3169 LONG_L $9, PT_R9(sp)
3170 #endif
3171 @@ -204,7 +204,7 @@
3172 LONG_L $31, PT_R31(sp)
3173 LONG_L $28, PT_R28(sp)
3174 LONG_L $25, PT_R25(sp)
3175 -#ifdef CONFIG_MIPS64
3176 +#ifdef __mips64
3177 LONG_L $8, PT_R8(sp)
3178 LONG_L $9, PT_R9(sp)
3179 #endif
3180 @@ -249,7 +249,7 @@
3181 LONG_L $31, PT_R31(sp)
3182 LONG_L $28, PT_R28(sp)
3183 LONG_L $25, PT_R25(sp)
3184 -#ifdef CONFIG_MIPS64
3185 +#ifdef __mips64
3186 LONG_L $8, PT_R8(sp)
3187 LONG_L $9, PT_R9(sp)
3188 #endif
3189 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/system.h linux-libc-headers-2.6.8.0/include/asm-mips/system.h
3190 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/system.h 2004-08-18 13:15:42.000000000 -0500
3191 +++ linux-libc-headers-2.6.8.0/include/asm-mips/system.h 2004-08-28 18:13:39.000000000 -0500
3192 @@ -15,10 +15,11 @@
3193 #include <asm/sgidefs.h>
3195 #include <linux/kernel.h>
3196 +#include <linux/linkage.h>
3198 #include <asm/addrspace.h>
3199 #include <asm/ptrace.h>
3200 -#include <asm/hazards.h>
3201 +#include <asm/types.h>
3203 __asm__ (
3204 ".macro\tlocal_irq_enable\n\t"
3205 @@ -311,7 +312,7 @@
3206 return retval;
3207 }
3209 -#ifdef CONFIG_MIPS64
3210 +#ifdef __mips64
3211 static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val)
3212 {
3213 __u64 retval;
3214 @@ -406,7 +407,7 @@
3215 return retval;
3216 }
3218 -#ifdef CONFIG_MIPS64
3219 +#ifdef __mips64
3220 static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
3221 unsigned long new)
3222 {
3223 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/tx4927/tx4927_mips.h linux-libc-headers-2.6.8.0/include/asm-mips/tx4927/tx4927_mips.h
3224 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/tx4927/tx4927_mips.h 2003-12-15 12:47:03.000000000 -0600
3225 +++ linux-libc-headers-2.6.8.0/include/asm-mips/tx4927/tx4927_mips.h 2004-08-26 05:22:30.000000000 -0500
3226 @@ -36,15 +36,15 @@
3227 ".set\tmips0");
3228 }
3230 -#define reg_rd08(r) ((u8 )(*((vu8 *)(r))))
3231 -#define reg_rd16(r) ((u16)(*((vu16*)(r))))
3232 -#define reg_rd32(r) ((u32)(*((vu32*)(r))))
3233 -#define reg_rd64(r) ((u64)(*((vu64*)(r))))
3234 +#define reg_rd08(r) ((__u8 )(*((vu8 *)(r))))
3235 +#define reg_rd16(r) ((__u16)(*((vu16*)(r))))
3236 +#define reg_rd32(r) ((__u32)(*((vu32*)(r))))
3237 +#define reg_rd64(r) ((__u64)(*((vu64*)(r))))
3239 -#define reg_wr08(r,v) ((*((vu8 *)(r)))=((u8 )(v)))
3240 -#define reg_wr16(r,v) ((*((vu16*)(r)))=((u16)(v)))
3241 -#define reg_wr32(r,v) ((*((vu32*)(r)))=((u32)(v)))
3242 -#define reg_wr64(r,v) ((*((vu64*)(r)))=((u64)(v)))
3243 +#define reg_wr08(r,v) ((*((vu8 *)(r)))=((__u8 )(v)))
3244 +#define reg_wr16(r,v) ((*((vu16*)(r)))=((__u16)(v)))
3245 +#define reg_wr32(r,v) ((*((vu32*)(r)))=((__u32)(v)))
3246 +#define reg_wr64(r,v) ((*((vu64*)(r)))=((__u64)(v)))
3248 typedef volatile __signed char vs8;
3249 typedef volatile unsigned char vu8;
3250 @@ -55,10 +55,10 @@
3251 typedef volatile __signed int vs32;
3252 typedef volatile unsigned int vu32;
3254 -typedef s8 s08;
3255 +typedef __s8 s08;
3256 typedef vs8 vs08;
3258 -typedef u8 u08;
3259 +typedef __u8 u08;
3260 typedef vu8 vu08;
3263 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/unaligned.h linux-libc-headers-2.6.8.0/include/asm-mips/unaligned.h
3264 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/unaligned.h 2004-08-15 15:38:27.000000000 -0500
3265 +++ linux-libc-headers-2.6.8.0/include/asm-mips/unaligned.h 2004-08-26 05:22:21.000000000 -0500
3266 @@ -17,7 +17,7 @@
3267 *
3268 * This macro should be used for accessing values larger in size than
3269 * single bytes at locations that are expected to be improperly aligned,
3270 - * e.g. retrieving a u16 value from a location not u16-aligned.
3271 + * e.g. retrieving a __u16 value from a location not __u16-aligned.
3272 *
3273 * Note that unaligned accesses can be very expensive on some architectures.
3274 */
3275 @@ -31,7 +31,7 @@
3276 *
3277 * This macro should be used for placing values larger in size than
3278 * single bytes at locations that are expected to be improperly aligned,
3279 - * e.g. writing a u16 value to a location not u16-aligned.
3280 + * e.g. writing a __u16 value to a location not __u16-aligned.
3281 *
3282 * Note that unaligned accesses can be very expensive on some architectures.
3283 */
3284 diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/xtalk/xwidget.h linux-libc-headers-2.6.8.0/include/asm-mips/xtalk/xwidget.h
3285 --- linux-libc-headers-2.6.8.0-dist/include/asm-mips/xtalk/xwidget.h 2003-12-15 12:47:03.000000000 -0600
3286 +++ linux-libc-headers-2.6.8.0/include/asm-mips/xtalk/xwidget.h 2004-08-26 05:23:33.000000000 -0500
3287 @@ -92,7 +92,7 @@
3288 * defined here
3289 */
3290 #ifndef __ASSEMBLY__
3291 -typedef u32 widgetreg_t;
3292 +typedef __u32 widgetreg_t;
3294 /* widget configuration registers */
3295 typedef volatile struct widget_cfg {
3296 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/acpi.h linux-libc-headers-2.6.8.0/include/linux/acpi.h
3297 --- linux-libc-headers-2.6.8.0-dist/include/linux/acpi.h 2004-08-18 13:16:01.000000000 -0500
3298 +++ linux-libc-headers-2.6.8.0/include/linux/acpi.h 2004-08-26 05:41:49.000000000 -0500
3299 @@ -51,49 +51,49 @@
3301 struct acpi_table_rsdp {
3302 char signature[8];
3303 - u8 checksum;
3304 + __u8 checksum;
3305 char oem_id[6];
3306 - u8 revision;
3307 - u32 rsdt_address;
3308 + __u8 revision;
3309 + __u32 rsdt_address;
3310 } __attribute__ ((packed));
3312 struct acpi20_table_rsdp {
3313 char signature[8];
3314 - u8 checksum;
3315 + __u8 checksum;
3316 char oem_id[6];
3317 - u8 revision;
3318 - u32 rsdt_address;
3319 - u32 length;
3320 - u64 xsdt_address;
3321 - u8 ext_checksum;
3322 - u8 reserved[3];
3323 + __u8 revision;
3324 + __u32 rsdt_address;
3325 + __u32 length;
3326 + __u64 xsdt_address;
3327 + __u8 ext_checksum;
3328 + __u8 reserved[3];
3329 } __attribute__ ((packed));
3331 typedef struct {
3332 - u8 type;
3333 - u8 length;
3334 + __u8 type;
3335 + __u8 length;
3336 } __attribute__ ((packed)) acpi_table_entry_header;
3338 /* Root System Description Table (RSDT) */
3340 struct acpi_table_rsdt {
3341 struct acpi_table_header header;
3342 - u32 entry[8];
3343 + __u32 entry[8];
3344 } __attribute__ ((packed));
3346 /* Extended System Description Table (XSDT) */
3348 struct acpi_table_xsdt {
3349 struct acpi_table_header header;
3350 - u64 entry[1];
3351 + __u64 entry[1];
3352 } __attribute__ ((packed));
3354 /* Fixed ACPI Description Table (FADT) */
3356 struct acpi_table_fadt {
3357 struct acpi_table_header header;
3358 - u32 facs_addr;
3359 - u32 dsdt_addr;
3360 + __u32 facs_addr;
3361 + __u32 dsdt_addr;
3362 /* ... */
3363 } __attribute__ ((packed));
3365 @@ -101,10 +101,10 @@
3367 struct acpi_table_madt {
3368 struct acpi_table_header header;
3369 - u32 lapic_address;
3370 + __u32 lapic_address;
3371 struct {
3372 - u32 pcat_compat:1;
3373 - u32 reserved:31;
3374 + __u32 pcat_compat:1;
3375 + __u32 reserved:31;
3376 } flags;
3377 } __attribute__ ((packed));
3379 @@ -122,85 +122,85 @@
3380 };
3382 typedef struct {
3383 - u16 polarity:2;
3384 - u16 trigger:2;
3385 - u16 reserved:12;
3386 + __u16 polarity:2;
3387 + __u16 trigger:2;
3388 + __u16 reserved:12;
3389 } __attribute__ ((packed)) acpi_interrupt_flags;
3391 struct acpi_table_lapic {
3392 acpi_table_entry_header header;
3393 - u8 acpi_id;
3394 - u8 id;
3395 + __u8 acpi_id;
3396 + __u8 id;
3397 struct {
3398 - u32 enabled:1;
3399 - u32 reserved:31;
3400 + __u32 enabled:1;
3401 + __u32 reserved:31;
3402 } flags;
3403 } __attribute__ ((packed));
3405 struct acpi_table_ioapic {
3406 acpi_table_entry_header header;
3407 - u8 id;
3408 - u8 reserved;
3409 - u32 address;
3410 - u32 global_irq_base;
3411 + __u8 id;
3412 + __u8 reserved;
3413 + __u32 address;
3414 + __u32 global_irq_base;
3415 } __attribute__ ((packed));
3417 struct acpi_table_int_src_ovr {
3418 acpi_table_entry_header header;
3419 - u8 bus;
3420 - u8 bus_irq;
3421 - u32 global_irq;
3422 + __u8 bus;
3423 + __u8 bus_irq;
3424 + __u32 global_irq;
3425 acpi_interrupt_flags flags;
3426 } __attribute__ ((packed));
3428 struct acpi_table_nmi_src {
3429 acpi_table_entry_header header;
3430 acpi_interrupt_flags flags;
3431 - u32 global_irq;
3432 + __u32 global_irq;
3433 } __attribute__ ((packed));
3435 struct acpi_table_lapic_nmi {
3436 acpi_table_entry_header header;
3437 - u8 acpi_id;
3438 + __u8 acpi_id;
3439 acpi_interrupt_flags flags;
3440 - u8 lint;
3441 + __u8 lint;
3442 } __attribute__ ((packed));
3444 struct acpi_table_lapic_addr_ovr {
3445 acpi_table_entry_header header;
3446 - u8 reserved[2];
3447 - u64 address;
3448 + __u8 reserved[2];
3449 + __u64 address;
3450 } __attribute__ ((packed));
3452 struct acpi_table_iosapic {
3453 acpi_table_entry_header header;
3454 - u8 id;
3455 - u8 reserved;
3456 - u32 global_irq_base;
3457 - u64 address;
3458 + __u8 id;
3459 + __u8 reserved;
3460 + __u32 global_irq_base;
3461 + __u64 address;
3462 } __attribute__ ((packed));
3464 struct acpi_table_lsapic {
3465 acpi_table_entry_header header;
3466 - u8 acpi_id;
3467 - u8 id;
3468 - u8 eid;
3469 - u8 reserved[3];
3470 + __u8 acpi_id;
3471 + __u8 id;
3472 + __u8 eid;
3473 + __u8 reserved[3];
3474 struct {
3475 - u32 enabled:1;
3476 - u32 reserved:31;
3477 + __u32 enabled:1;
3478 + __u32 reserved:31;
3479 } flags;
3480 } __attribute__ ((packed));
3482 struct acpi_table_plat_int_src {
3483 acpi_table_entry_header header;
3484 acpi_interrupt_flags flags;
3485 - u8 type; /* See acpi_interrupt_type */
3486 - u8 id;
3487 - u8 eid;
3488 - u8 iosapic_vector;
3489 - u32 global_irq;
3490 - u32 reserved;
3491 + __u8 type; /* See acpi_interrupt_type */
3492 + __u8 id;
3493 + __u8 eid;
3494 + __u8 iosapic_vector;
3495 + __u32 global_irq;
3496 + __u32 reserved;
3497 } __attribute__ ((packed));
3499 enum acpi_interrupt_id {
3500 @@ -213,21 +213,21 @@
3501 #define ACPI_SPACE_MEM 0
3503 struct acpi_gen_regaddr {
3504 - u8 space_id;
3505 - u8 bit_width;
3506 - u8 bit_offset;
3507 - u8 resv;
3508 - u32 addrl;
3509 - u32 addrh;
3510 + __u8 space_id;
3511 + __u8 bit_width;
3512 + __u8 bit_offset;
3513 + __u8 resv;
3514 + __u32 addrl;
3515 + __u32 addrh;
3516 } __attribute__ ((packed));
3518 struct acpi_table_hpet {
3519 struct acpi_table_header header;
3520 - u32 id;
3521 + __u32 id;
3522 struct acpi_gen_regaddr addr;
3523 - u8 number;
3524 - u16 min_tick;
3525 - u8 page_protect;
3526 + __u8 number;
3527 + __u16 min_tick;
3528 + __u8 page_protect;
3529 } __attribute__ ((packed));
3531 /*
3532 @@ -236,17 +236,17 @@
3533 */
3534 struct acpi_table_sbf
3535 {
3536 - u8 sbf_signature[4];
3537 - u32 sbf_len;
3538 - u8 sbf_revision;
3539 - u8 sbf_csum;
3540 - u8 sbf_oemid[6];
3541 - u8 sbf_oemtable[8];
3542 - u8 sbf_revdata[4];
3543 - u8 sbf_creator[4];
3544 - u8 sbf_crearev[4];
3545 - u8 sbf_cmos;
3546 - u8 sbf_spare[3];
3547 + __u8 sbf_signature[4];
3548 + __u32 sbf_len;
3549 + __u8 sbf_revision;
3550 + __u8 sbf_csum;
3551 + __u8 sbf_oemid[6];
3552 + __u8 sbf_oemtable[8];
3553 + __u8 sbf_revdata[4];
3554 + __u8 sbf_creator[4];
3555 + __u8 sbf_crearev[4];
3556 + __u8 sbf_cmos;
3557 + __u8 sbf_spare[3];
3558 } __attribute__ ((packed));
3560 /*
3561 @@ -256,8 +256,8 @@
3563 struct acpi_table_srat {
3564 struct acpi_table_header header;
3565 - u32 table_revision;
3566 - u64 reserved;
3567 + __u32 table_revision;
3568 + __u64 reserved;
3569 } __attribute__ ((packed));
3571 enum acpi_srat_entry_id {
3572 @@ -268,31 +268,31 @@
3574 struct acpi_table_processor_affinity {
3575 acpi_table_entry_header header;
3576 - u8 proximity_domain;
3577 - u8 apic_id;
3578 + __u8 proximity_domain;
3579 + __u8 apic_id;
3580 struct {
3581 - u32 enabled:1;
3582 - u32 reserved:31;
3583 + __u32 enabled:1;
3584 + __u32 reserved:31;
3585 } flags;
3586 - u8 lsapic_eid;
3587 - u8 reserved[7];
3588 + __u8 lsapic_eid;
3589 + __u8 reserved[7];
3590 } __attribute__ ((packed));
3592 struct acpi_table_memory_affinity {
3593 acpi_table_entry_header header;
3594 - u8 proximity_domain;
3595 - u8 reserved1[5];
3596 - u32 base_addr_lo;
3597 - u32 base_addr_hi;
3598 - u32 length_lo;
3599 - u32 length_hi;
3600 - u32 memory_type; /* See acpi_address_range_id */
3601 + __u8 proximity_domain;
3602 + __u8 reserved1[5];
3603 + __u32 base_addr_lo;
3604 + __u32 base_addr_hi;
3605 + __u32 length_lo;
3606 + __u32 length_hi;
3607 + __u32 memory_type; /* See acpi_address_range_id */
3608 struct {
3609 - u32 enabled:1;
3610 - u32 hot_pluggable:1;
3611 - u32 reserved:30;
3612 + __u32 enabled:1;
3613 + __u32 hot_pluggable:1;
3614 + __u32 reserved:30;
3615 } flags;
3616 - u64 reserved2;
3617 + __u64 reserved2;
3618 } __attribute__ ((packed));
3620 enum acpi_address_range_id {
3621 @@ -310,17 +310,17 @@
3623 struct acpi_table_slit {
3624 struct acpi_table_header header;
3625 - u64 localities;
3626 - u8 entry[1]; /* real size = localities^2 */
3627 + __u64 localities;
3628 + __u8 entry[1]; /* real size = localities^2 */
3629 } __attribute__ ((packed));
3631 /* Smart Battery Description Table (SBST) */
3633 struct acpi_table_sbst {
3634 struct acpi_table_header header;
3635 - u32 warning; /* Warn user */
3636 - u32 low; /* Critical sleep */
3637 - u32 critical; /* Critical shutdown */
3638 + __u32 warning; /* Warn user */
3639 + __u32 low; /* Critical sleep */
3640 + __u32 critical; /* Critical shutdown */
3641 } __attribute__ ((packed));
3643 /* Embedded Controller Boot Resources Table (ECDT) */
3644 @@ -329,8 +329,8 @@
3645 struct acpi_table_header header;
3646 struct acpi_generic_address ec_control;
3647 struct acpi_generic_address ec_data;
3648 - u32 uid;
3649 - u8 gpe_bit;
3650 + __u32 uid;
3651 + __u8 gpe_bit;
3652 char ec_id[0];
3653 } __attribute__ ((packed));
3655 @@ -338,9 +338,9 @@
3657 struct acpi_table_mcfg {
3658 struct acpi_table_header header;
3659 - u8 reserved[8];
3660 - u32 base_address;
3661 - u32 base_reserved;
3662 + __u8 reserved[8];
3663 + __u32 base_address;
3664 + __u32 base_reserved;
3665 } __attribute__ ((packed));
3667 /* Table Handlers */
3668 @@ -396,7 +396,7 @@
3670 extern int acpi_mp_config;
3672 -extern u32 pci_mmcfg_base_addr;
3673 +extern __u32 pci_mmcfg_base_addr;
3675 extern int sbf_port ;
3677 @@ -411,20 +411,20 @@
3679 #endif /*!CONFIG_ACPI_BOOT*/
3681 -unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
3682 -int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
3683 +unsigned int acpi_register_gsi (__u32 gsi, int edge_level, int active_high_low);
3684 +int acpi_gsi_to_irq (__u32 gsi, unsigned int *irq);
3686 #ifdef CONFIG_ACPI_PCI
3688 struct acpi_prt_entry {
3689 struct list_head node;
3690 struct acpi_pci_id id;
3691 - u8 pin;
3692 + __u8 pin;
3693 struct {
3694 acpi_handle handle;
3695 - u32 index;
3696 + __u32 index;
3697 } link;
3698 - u32 irq;
3699 + __u32 irq;
3700 };
3702 struct acpi_prt_list {
3703 @@ -451,8 +451,8 @@
3705 #ifdef CONFIG_ACPI_EC
3707 -int ec_read(u8 addr, u8 *val);
3708 -int ec_write(u8 addr, u8 val);
3709 +int ec_read(__u8 addr, __u8 *val);
3710 +int ec_write(__u8 addr, __u8 val);
3712 #endif /*CONFIG_ACPI_EC*/
3714 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_i.h linux-libc-headers-2.6.8.0/include/linux/affs_fs_i.h
3715 --- linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_i.h 2003-12-31 17:46:48.000000000 -0600
3716 +++ linux-libc-headers-2.6.8.0/include/linux/affs_fs_i.h 2004-08-26 05:41:49.000000000 -0500
3717 @@ -9,13 +9,13 @@
3718 //#define AFFS_CACHE_SIZE (4*4)
3720 #define AFFS_MAX_PREALLOC 32
3721 -#define AFFS_LC_SIZE (AFFS_CACHE_SIZE/sizeof(u32)/2)
3722 +#define AFFS_LC_SIZE (AFFS_CACHE_SIZE/sizeof(__u32)/2)
3723 #define AFFS_AC_SIZE (AFFS_CACHE_SIZE/sizeof(struct affs_ext_key)/2)
3724 #define AFFS_AC_MASK (AFFS_AC_SIZE-1)
3726 struct affs_ext_key {
3727 - u32 ext; /* idx of the extended block */
3728 - u32 key; /* block number */
3729 + __u32 ext; /* idx of the extended block */
3730 + __u32 key; /* block number */
3731 };
3734 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_sb.h linux-libc-headers-2.6.8.0/include/linux/affs_fs_sb.h
3735 --- linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_sb.h 2004-08-18 13:16:01.000000000 -0500
3736 +++ linux-libc-headers-2.6.8.0/include/linux/affs_fs_sb.h 2004-08-26 05:41:49.000000000 -0500
3737 @@ -9,8 +9,8 @@
3738 */
3740 struct affs_bm_info {
3741 - u32 bm_key; /* Disk block number */
3742 - u32 bm_free; /* Free blocks in here */
3743 + __u32 bm_key; /* Disk block number */
3744 + __u32 bm_free; /* Free blocks in here */
3745 };
3747 #define SF_INTL 0x0001 /* International filesystem. */
3748 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/affs_hardblocks.h linux-libc-headers-2.6.8.0/include/linux/affs_hardblocks.h
3749 --- linux-libc-headers-2.6.8.0-dist/include/linux/affs_hardblocks.h 2003-12-15 12:46:58.000000000 -0600
3750 +++ linux-libc-headers-2.6.8.0/include/linux/affs_hardblocks.h 2004-08-26 05:41:49.000000000 -0500
3751 @@ -4,59 +4,59 @@
3752 /* Just the needed definitions for the RDB of an Amiga HD. */
3754 struct RigidDiskBlock {
3755 - u32 rdb_ID;
3756 - u32 rdb_SummedLongs;
3757 - s32 rdb_ChkSum;
3758 - u32 rdb_HostID;
3759 - u32 rdb_BlockBytes;
3760 - u32 rdb_Flags;
3761 - u32 rdb_BadBlockList;
3762 - u32 rdb_PartitionList;
3763 - u32 rdb_FileSysHeaderList;
3764 - u32 rdb_DriveInit;
3765 - u32 rdb_Reserved1[6];
3766 - u32 rdb_Cylinders;
3767 - u32 rdb_Sectors;
3768 - u32 rdb_Heads;
3769 - u32 rdb_Interleave;
3770 - u32 rdb_Park;
3771 - u32 rdb_Reserved2[3];
3772 - u32 rdb_WritePreComp;
3773 - u32 rdb_ReducedWrite;
3774 - u32 rdb_StepRate;
3775 - u32 rdb_Reserved3[5];
3776 - u32 rdb_RDBBlocksLo;
3777 - u32 rdb_RDBBlocksHi;
3778 - u32 rdb_LoCylinder;
3779 - u32 rdb_HiCylinder;
3780 - u32 rdb_CylBlocks;
3781 - u32 rdb_AutoParkSeconds;
3782 - u32 rdb_HighRDSKBlock;
3783 - u32 rdb_Reserved4;
3784 + __u32 rdb_ID;
3785 + __u32 rdb_SummedLongs;
3786 + __s32 rdb_ChkSum;
3787 + __u32 rdb_HostID;
3788 + __u32 rdb_BlockBytes;
3789 + __u32 rdb_Flags;
3790 + __u32 rdb_BadBlockList;
3791 + __u32 rdb_PartitionList;
3792 + __u32 rdb_FileSysHeaderList;
3793 + __u32 rdb_DriveInit;
3794 + __u32 rdb_Reserved1[6];
3795 + __u32 rdb_Cylinders;
3796 + __u32 rdb_Sectors;
3797 + __u32 rdb_Heads;
3798 + __u32 rdb_Interleave;
3799 + __u32 rdb_Park;
3800 + __u32 rdb_Reserved2[3];
3801 + __u32 rdb_WritePreComp;
3802 + __u32 rdb_ReducedWrite;
3803 + __u32 rdb_StepRate;
3804 + __u32 rdb_Reserved3[5];
3805 + __u32 rdb_RDBBlocksLo;
3806 + __u32 rdb_RDBBlocksHi;
3807 + __u32 rdb_LoCylinder;
3808 + __u32 rdb_HiCylinder;
3809 + __u32 rdb_CylBlocks;
3810 + __u32 rdb_AutoParkSeconds;
3811 + __u32 rdb_HighRDSKBlock;
3812 + __u32 rdb_Reserved4;
3813 char rdb_DiskVendor[8];
3814 char rdb_DiskProduct[16];
3815 char rdb_DiskRevision[4];
3816 char rdb_ControllerVendor[8];
3817 char rdb_ControllerProduct[16];
3818 char rdb_ControllerRevision[4];
3819 - u32 rdb_Reserved5[10];
3820 + __u32 rdb_Reserved5[10];
3821 };
3823 #define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */
3825 struct PartitionBlock {
3826 - u32 pb_ID;
3827 - u32 pb_SummedLongs;
3828 - s32 pb_ChkSum;
3829 - u32 pb_HostID;
3830 - u32 pb_Next;
3831 - u32 pb_Flags;
3832 - u32 pb_Reserved1[2];
3833 - u32 pb_DevFlags;
3834 - u8 pb_DriveName[32];
3835 - u32 pb_Reserved2[15];
3836 - u32 pb_Environment[17];
3837 - u32 pb_EReserved[15];
3838 + __u32 pb_ID;
3839 + __u32 pb_SummedLongs;
3840 + __s32 pb_ChkSum;
3841 + __u32 pb_HostID;
3842 + __u32 pb_Next;
3843 + __u32 pb_Flags;
3844 + __u32 pb_Reserved1[2];
3845 + __u32 pb_DevFlags;
3846 + __u8 pb_DriveName[32];
3847 + __u32 pb_Reserved2[15];
3848 + __u32 pb_Environment[17];
3849 + __u32 pb_EReserved[15];
3850 };
3852 #define IDNAME_PARTITION 0x50415254 /* "PART" */
3853 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/amigaffs.h linux-libc-headers-2.6.8.0/include/linux/amigaffs.h
3854 --- linux-libc-headers-2.6.8.0-dist/include/linux/amigaffs.h 2003-12-31 17:46:48.000000000 -0600
3855 +++ linux-libc-headers-2.6.8.0/include/linux/amigaffs.h 2004-08-26 05:41:49.000000000 -0500
3856 @@ -64,90 +64,90 @@
3857 #define AFFS_DATA(bh) (((struct affs_data_head *)(bh)->b_data)->data)
3859 struct affs_date {
3860 - u32 days;
3861 - u32 mins;
3862 - u32 ticks;
3863 + __u32 days;
3864 + __u32 mins;
3865 + __u32 ticks;
3866 };
3868 struct affs_short_date {
3869 - u16 days;
3870 - u16 mins;
3871 - u16 ticks;
3872 + __u16 days;
3873 + __u16 mins;
3874 + __u16 ticks;
3875 };
3877 struct affs_root_head {
3878 - u32 ptype;
3879 - u32 spare1;
3880 - u32 spare2;
3881 - u32 hash_size;
3882 - u32 spare3;
3883 - u32 checksum;
3884 - u32 hashtable[1];
3885 + __u32 ptype;
3886 + __u32 spare1;
3887 + __u32 spare2;
3888 + __u32 hash_size;
3889 + __u32 spare3;
3890 + __u32 checksum;
3891 + __u32 hashtable[1];
3892 };
3894 struct affs_root_tail {
3895 - u32 bm_flag;
3896 - u32 bm_blk[AFFS_ROOT_BMAPS];
3897 - u32 bm_ext;
3898 + __u32 bm_flag;
3899 + __u32 bm_blk[AFFS_ROOT_BMAPS];
3900 + __u32 bm_ext;
3901 struct affs_date root_change;
3902 - u8 disk_name[32];
3903 - u32 spare1;
3904 - u32 spare2;
3905 + __u8 disk_name[32];
3906 + __u32 spare1;
3907 + __u32 spare2;
3908 struct affs_date disk_change;
3909 struct affs_date disk_create;
3910 - u32 spare3;
3911 - u32 spare4;
3912 - u32 dcache;
3913 - u32 stype;
3914 + __u32 spare3;
3915 + __u32 spare4;
3916 + __u32 dcache;
3917 + __u32 stype;
3918 };
3920 struct affs_head {
3921 - u32 ptype;
3922 - u32 key;
3923 - u32 block_count;
3924 - u32 spare1;
3925 - u32 first_data;
3926 - u32 checksum;
3927 - u32 table[1];
3928 + __u32 ptype;
3929 + __u32 key;
3930 + __u32 block_count;
3931 + __u32 spare1;
3932 + __u32 first_data;
3933 + __u32 checksum;
3934 + __u32 table[1];
3935 };
3937 struct affs_tail {
3938 - u32 spare1;
3939 - u16 uid;
3940 - u16 gid;
3941 - u32 protect;
3942 - u32 size;
3943 - u8 comment[92];
3944 + __u32 spare1;
3945 + __u16 uid;
3946 + __u16 gid;
3947 + __u32 protect;
3948 + __u32 size;
3949 + __u8 comment[92];
3950 struct affs_date change;
3951 - u8 name[32];
3952 - u32 spare2;
3953 - u32 original;
3954 - u32 link_chain;
3955 - u32 spare[5];
3956 - u32 hash_chain;
3957 - u32 parent;
3958 - u32 extension;
3959 - u32 stype;
3960 + __u8 name[32];
3961 + __u32 spare2;
3962 + __u32 original;
3963 + __u32 link_chain;
3964 + __u32 spare[5];
3965 + __u32 hash_chain;
3966 + __u32 parent;
3967 + __u32 extension;
3968 + __u32 stype;
3969 };
3971 struct slink_front
3972 {
3973 - u32 ptype;
3974 - u32 key;
3975 - u32 spare1[3];
3976 - u32 checksum;
3977 - u8 symname[1]; /* depends on block size */
3978 + __u32 ptype;
3979 + __u32 key;
3980 + __u32 spare1[3];
3981 + __u32 checksum;
3982 + __u8 symname[1]; /* depends on block size */
3983 };
3985 struct affs_data_head
3986 {
3987 - u32 ptype;
3988 - u32 key;
3989 - u32 sequence;
3990 - u32 size;
3991 - u32 next;
3992 - u32 checksum;
3993 - u8 data[1]; /* depends on block size */
3994 + __u32 ptype;
3995 + __u32 key;
3996 + __u32 sequence;
3997 + __u32 size;
3998 + __u32 next;
3999 + __u32 checksum;
4000 + __u8 data[1]; /* depends on block size */
4001 };
4003 /* Permission bits */
4004 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/ata.h linux-libc-headers-2.6.8.0/include/linux/ata.h
4005 --- linux-libc-headers-2.6.8.0-dist/include/linux/ata.h 2004-08-18 13:16:01.000000000 -0500
4006 +++ linux-libc-headers-2.6.8.0/include/linux/ata.h 2004-08-26 05:41:49.000000000 -0500
4007 @@ -34,7 +34,7 @@
4008 ATA_MAX_PRD = 256, /* we could make these 256/256 */
4009 ATA_SECT_SIZE = 512,
4010 ATA_SECT_SIZE_MASK = (ATA_SECT_SIZE - 1),
4011 - ATA_SECT_DWORDS = ATA_SECT_SIZE / sizeof(u32),
4012 + ATA_SECT_DWORDS = ATA_SECT_SIZE / sizeof(__u32),
4014 ATA_ID_WORDS = 256,
4015 ATA_ID_PROD_OFS = 27,
4016 @@ -176,31 +176,31 @@
4017 /* core structures */
4019 struct ata_prd {
4020 - u32 addr;
4021 - u32 flags_len;
4022 + __u32 addr;
4023 + __u32 flags_len;
4024 } __attribute__((packed));
4026 struct ata_taskfile {
4027 unsigned long flags; /* ATA_TFLAG_xxx */
4028 - u8 protocol; /* ATA_PROT_xxx */
4029 + __u8 protocol; /* ATA_PROT_xxx */
4031 - u8 ctl; /* control reg */
4032 + __u8 ctl; /* control reg */
4034 - u8 hob_feature; /* additional data */
4035 - u8 hob_nsect; /* to support LBA48 */
4036 - u8 hob_lbal;
4037 - u8 hob_lbam;
4038 - u8 hob_lbah;
4039 + __u8 hob_feature; /* additional data */
4040 + __u8 hob_nsect; /* to support LBA48 */
4041 + __u8 hob_lbal;
4042 + __u8 hob_lbam;
4043 + __u8 hob_lbah;
4045 - u8 feature;
4046 - u8 nsect;
4047 - u8 lbal;
4048 - u8 lbam;
4049 - u8 lbah;
4050 + __u8 feature;
4051 + __u8 nsect;
4052 + __u8 lbal;
4053 + __u8 lbam;
4054 + __u8 lbah;
4056 - u8 device;
4057 + __u8 device;
4059 - u8 command; /* IO operation */
4060 + __u8 command; /* IO operation */
4061 };
4063 #define ata_id_is_ata(dev) (((dev)->id[0] & (1 << 15)) == 0)
4064 @@ -213,12 +213,12 @@
4065 #define ata_id_has_dma(dev) ((dev)->id[49] & (1 << 8))
4066 #define ata_id_removeable(dev) ((dev)->id[0] & (1 << 7))
4067 #define ata_id_u32(dev,n) \
4068 - (((u32) (dev)->id[(n) + 1] << 16) | ((u32) (dev)->id[(n)]))
4069 + (((__u32) (dev)->id[(n) + 1] << 16) | ((__u32) (dev)->id[(n)]))
4070 #define ata_id_u64(dev,n) \
4071 - ( ((u64) dev->id[(n) + 3] << 48) | \
4072 - ((u64) dev->id[(n) + 2] << 32) | \
4073 - ((u64) dev->id[(n) + 1] << 16) | \
4074 - ((u64) dev->id[(n) + 0]) )
4075 + ( ((__u64) dev->id[(n) + 3] << 48) | \
4076 + ((__u64) dev->id[(n) + 2] << 32) | \
4077 + ((__u64) dev->id[(n) + 1] << 16) | \
4078 + ((__u64) dev->id[(n) + 0]) )
4080 static inline int is_atapi_taskfile(struct ata_taskfile *tf)
4081 {
4082 @@ -226,7 +226,7 @@
4083 (tf->protocol == ATA_PROT_ATAPI_DMA);
4084 }
4086 -static inline int ata_ok(u8 status)
4087 +static inline int ata_ok(__u8 status)
4088 {
4089 return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
4090 == ATA_DRDY);
4091 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/bitops.h linux-libc-headers-2.6.8.0/include/linux/bitops.h
4092 --- linux-libc-headers-2.6.8.0-dist/include/linux/bitops.h 2004-06-09 07:00:49.000000000 -0500
4093 +++ linux-libc-headers-2.6.8.0/include/linux/bitops.h 2004-08-26 05:41:49.000000000 -0500
4094 @@ -114,7 +114,7 @@
4095 return generic_hweight32((unsigned int)(w >> 32)) +
4096 generic_hweight32((unsigned int)w);
4097 #else
4098 - u64 res;
4099 + __u64 res;
4100 res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);
4101 res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);
4102 res = (res & 0x0F0F0F0F0F0F0F0Ful) + ((res >> 4) & 0x0F0F0F0F0F0F0F0Ful);
4103 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/compat.h linux-libc-headers-2.6.8.0/include/linux/compat.h
4104 --- linux-libc-headers-2.6.8.0-dist/include/linux/compat.h 2004-06-09 07:00:49.000000000 -0500
4105 +++ linux-libc-headers-2.6.8.0/include/linux/compat.h 2004-08-26 05:41:49.000000000 -0500
4106 @@ -78,9 +78,9 @@
4107 };
4109 struct compat_dirent {
4110 - u32 d_ino;
4111 + __u32 d_ino;
4112 compat_off_t d_off;
4113 - u16 d_reclen;
4114 + __u16 d_reclen;
4115 char d_name[256];
4116 };
4118 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/console.h linux-libc-headers-2.6.8.0/include/linux/console.h
4119 --- linux-libc-headers-2.6.8.0-dist/include/linux/console.h 2004-08-18 13:16:02.000000000 -0500
4120 +++ linux-libc-headers-2.6.8.0/include/linux/console.h 2004-08-26 05:41:49.000000000 -0500
4121 @@ -49,9 +49,9 @@
4122 int (*con_scrolldelta)(struct vc_data *, int);
4123 int (*con_set_origin)(struct vc_data *);
4124 void (*con_save_screen)(struct vc_data *);
4125 - u8 (*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8);
4126 - void (*con_invert_region)(struct vc_data *, u16 *, int);
4127 - u16 *(*con_screen_pos)(struct vc_data *, int);
4128 + __u8 (*con_build_attr)(struct vc_data *, __u8, __u8, __u8, __u8, __u8);
4129 + void (*con_invert_region)(struct vc_data *, __u16 *, int);
4130 + __u16 *(*con_screen_pos)(struct vc_data *, int);
4131 unsigned long (*con_getxy)(struct vc_data *, unsigned long, int *, int *);
4132 };
4134 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cpufreq.h linux-libc-headers-2.6.8.0/include/linux/cpufreq.h
4135 --- linux-libc-headers-2.6.8.0-dist/include/linux/cpufreq.h 2004-06-23 16:52:53.000000000 -0500
4136 +++ linux-libc-headers-2.6.8.0/include/linux/cpufreq.h 2004-08-26 05:41:49.000000000 -0500
4137 @@ -103,7 +103,7 @@
4138 unsigned int cpu; /* cpu nr */
4139 unsigned int old;
4140 unsigned int new;
4141 - u8 flags; /* flags of cpufreq_driver, see below. */
4142 + __u8 flags; /* flags of cpufreq_driver, see below. */
4143 };
4146 @@ -120,13 +120,13 @@
4147 {
4148 #if BITS_PER_LONG == 32
4150 - u64 result = ((u64) old) * ((u64) mult);
4151 + __u64 result = ((__u64) old) * ((__u64) mult);
4152 do_div(result, div);
4153 return (unsigned long) result;
4155 #elif BITS_PER_LONG == 64
4157 - unsigned long result = old * ((u64) mult);
4158 + unsigned long result = old * ((__u64) mult);
4159 result /= div;
4160 return result;
4162 @@ -178,7 +178,7 @@
4163 struct cpufreq_driver {
4164 struct module *owner;
4165 char name[CPUFREQ_NAME_LEN];
4166 - u8 flags;
4167 + __u8 flags;
4169 /* needed by all drivers */
4170 int (*init) (struct cpufreq_policy *policy);
4171 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cramfs_fs.h linux-libc-headers-2.6.8.0/include/linux/cramfs_fs.h
4172 --- linux-libc-headers-2.6.8.0-dist/include/linux/cramfs_fs.h 2004-01-05 12:42:27.000000000 -0600
4173 +++ linux-libc-headers-2.6.8.0/include/linux/cramfs_fs.h 2004-08-26 05:41:49.000000000 -0500
4174 @@ -2,9 +2,9 @@
4175 #define __CRAMFS_H
4178 -typedef unsigned char u8;
4179 -typedef unsigned short u16;
4180 -typedef unsigned int u32;
4181 +typedef unsigned char __u8;
4182 +typedef unsigned short __u16;
4183 +typedef unsigned int __u32;
4186 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
4187 @@ -31,9 +31,9 @@
4188 * Reasonably terse representation of the inode data.
4189 */
4190 struct cramfs_inode {
4191 - u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
4192 + __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
4193 /* SIZE for device files is i_rdev */
4194 - u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
4195 + __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
4196 /* NAMELEN is the length of the file name, divided by 4 and
4197 rounded up. (cramfs doesn't support hard links.) */
4198 /* OFFSET: For symlinks and non-empty regular files, this
4199 @@ -42,27 +42,27 @@
4200 see README). For non-empty directories it is the offset
4201 (divided by 4) of the inode of the first file in that
4202 directory. For anything else, offset is zero. */
4203 - u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
4204 + __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
4205 };
4207 struct cramfs_info {
4208 - u32 crc;
4209 - u32 edition;
4210 - u32 blocks;
4211 - u32 files;
4212 + __u32 crc;
4213 + __u32 edition;
4214 + __u32 blocks;
4215 + __u32 files;
4216 };
4218 /*
4219 * Superblock information at the beginning of the FS.
4220 */
4221 struct cramfs_super {
4222 - u32 magic; /* 0x28cd3d45 - random number */
4223 - u32 size; /* length in bytes */
4224 - u32 flags; /* feature flags */
4225 - u32 future; /* reserved for future use */
4226 - u8 signature[16]; /* "Compressed ROMFS" */
4227 + __u32 magic; /* 0x28cd3d45 - random number */
4228 + __u32 size; /* length in bytes */
4229 + __u32 flags; /* feature flags */
4230 + __u32 future; /* reserved for future use */
4231 + __u8 signature[16]; /* "Compressed ROMFS" */
4232 struct cramfs_info fsid; /* unique filesystem info */
4233 - u8 name[16]; /* user-defined name */
4234 + __u8 name[16]; /* user-defined name */
4235 struct cramfs_inode root; /* root inode data */
4236 };
4238 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/crc32.h linux-libc-headers-2.6.8.0/include/linux/crc32.h
4239 --- linux-libc-headers-2.6.8.0-dist/include/linux/crc32.h 2003-12-15 12:46:57.000000000 -0600
4240 +++ linux-libc-headers-2.6.8.0/include/linux/crc32.h 2004-08-26 05:41:49.000000000 -0500
4241 @@ -7,9 +7,9 @@
4243 #include <linux/types.h>
4245 -extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len);
4246 -extern u32 crc32_be(u32 crc, unsigned char const *p, size_t len);
4247 -extern u32 bitreverse(u32 in);
4248 +extern __u32 crc32_le(__u32 crc, unsigned char const *p, size_t len);
4249 +extern __u32 crc32_be(__u32 crc, unsigned char const *p, size_t len);
4250 +extern __u32 bitreverse(__u32 in);
4252 #define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)data, length)
4254 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/crypto.h linux-libc-headers-2.6.8.0/include/linux/crypto.h
4255 --- linux-libc-headers-2.6.8.0-dist/include/linux/crypto.h 2004-04-19 16:13:51.000000000 -0500
4256 +++ linux-libc-headers-2.6.8.0/include/linux/crypto.h 2004-08-26 05:41:49.000000000 -0500
4257 @@ -63,28 +63,28 @@
4258 struct cipher_alg {
4259 unsigned int cia_min_keysize;
4260 unsigned int cia_max_keysize;
4261 - int (*cia_setkey)(void *ctx, const u8 *key,
4262 - unsigned int keylen, u32 *flags);
4263 - void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);
4264 - void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);
4265 + int (*cia_setkey)(void *ctx, const __u8 *key,
4266 + unsigned int keylen, __u32 *flags);
4267 + void (*cia_encrypt)(void *ctx, __u8 *dst, const __u8 *src);
4268 + void (*cia_decrypt)(void *ctx, __u8 *dst, const __u8 *src);
4269 };
4271 struct digest_alg {
4272 unsigned int dia_digestsize;
4273 void (*dia_init)(void *ctx);
4274 - void (*dia_update)(void *ctx, const u8 *data, unsigned int len);
4275 - void (*dia_final)(void *ctx, u8 *out);
4276 - int (*dia_setkey)(void *ctx, const u8 *key,
4277 - unsigned int keylen, u32 *flags);
4278 + void (*dia_update)(void *ctx, const __u8 *data, unsigned int len);
4279 + void (*dia_final)(void *ctx, __u8 *out);
4280 + int (*dia_setkey)(void *ctx, const __u8 *key,
4281 + unsigned int keylen, __u32 *flags);
4282 };
4284 struct compress_alg {
4285 int (*coa_init)(void *ctx);
4286 void (*coa_exit)(void *ctx);
4287 - int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen,
4288 - u8 *dst, unsigned int *dlen);
4289 - int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen,
4290 - u8 *dst, unsigned int *dlen);
4291 + int (*coa_compress)(void *ctx, const __u8 *src, unsigned int slen,
4292 + __u8 *dst, unsigned int *dlen);
4293 + int (*coa_decompress)(void *ctx, const __u8 *src, unsigned int slen,
4294 + __u8 *dst, unsigned int *dlen);
4295 };
4297 #define cra_cipher cra_u.cipher
4298 @@ -93,7 +93,7 @@
4300 struct crypto_alg {
4301 struct list_head cra_list;
4302 - u32 cra_flags;
4303 + __u32 cra_flags;
4304 unsigned int cra_blocksize;
4305 unsigned int cra_ctxsize;
4306 const char cra_name[CRYPTO_MAX_ALG_NAME];
4307 @@ -116,7 +116,7 @@
4308 /*
4309 * Algorithm query interface.
4310 */
4311 -int crypto_alg_available(const char *name, u32 flags);
4312 +int crypto_alg_available(const char *name, __u32 flags);
4314 /*
4315 * Transforms: user-instantiated objects which encapsulate algorithms
4316 @@ -128,9 +128,9 @@
4317 struct cipher_tfm {
4318 void *cit_iv;
4319 unsigned int cit_ivsize;
4320 - u32 cit_mode;
4321 + __u32 cit_mode;
4322 int (*cit_setkey)(struct crypto_tfm *tfm,
4323 - const u8 *key, unsigned int keylen);
4324 + const __u8 *key, unsigned int keylen);
4325 int (*cit_encrypt)(struct crypto_tfm *tfm,
4326 struct scatterlist *dst,
4327 struct scatterlist *src,
4328 @@ -138,7 +138,7 @@
4329 int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
4330 struct scatterlist *dst,
4331 struct scatterlist *src,
4332 - unsigned int nbytes, u8 *iv);
4333 + unsigned int nbytes, __u8 *iv);
4334 int (*cit_decrypt)(struct crypto_tfm *tfm,
4335 struct scatterlist *dst,
4336 struct scatterlist *src,
4337 @@ -146,19 +146,19 @@
4338 int (*cit_decrypt_iv)(struct crypto_tfm *tfm,
4339 struct scatterlist *dst,
4340 struct scatterlist *src,
4341 - unsigned int nbytes, u8 *iv);
4342 - void (*cit_xor_block)(u8 *dst, const u8 *src);
4343 + unsigned int nbytes, __u8 *iv);
4344 + void (*cit_xor_block)(__u8 *dst, const __u8 *src);
4345 };
4347 struct digest_tfm {
4348 void (*dit_init)(struct crypto_tfm *tfm);
4349 void (*dit_update)(struct crypto_tfm *tfm,
4350 struct scatterlist *sg, unsigned int nsg);
4351 - void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
4352 + void (*dit_final)(struct crypto_tfm *tfm, __u8 *out);
4353 void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
4354 - unsigned int nsg, u8 *out);
4355 + unsigned int nsg, __u8 *out);
4356 int (*dit_setkey)(struct crypto_tfm *tfm,
4357 - const u8 *key, unsigned int keylen);
4358 + const __u8 *key, unsigned int keylen);
4359 #ifdef CONFIG_CRYPTO_HMAC
4360 void *dit_hmac_block;
4361 #endif
4362 @@ -166,11 +166,11 @@
4364 struct compress_tfm {
4365 int (*cot_compress)(struct crypto_tfm *tfm,
4366 - const u8 *src, unsigned int slen,
4367 - u8 *dst, unsigned int *dlen);
4368 + const __u8 *src, unsigned int slen,
4369 + __u8 *dst, unsigned int *dlen);
4370 int (*cot_decompress)(struct crypto_tfm *tfm,
4371 - const u8 *src, unsigned int slen,
4372 - u8 *dst, unsigned int *dlen);
4373 + const __u8 *src, unsigned int slen,
4374 + __u8 *dst, unsigned int *dlen);
4375 };
4377 #define crt_cipher crt_u.cipher
4378 @@ -179,7 +179,7 @@
4380 struct crypto_tfm {
4382 - u32 crt_flags;
4383 + __u32 crt_flags;
4385 union {
4386 struct cipher_tfm cipher;
4387 @@ -203,7 +203,7 @@
4388 * crypto_free_tfm() frees up the transform and any associated resources,
4389 * then drops the refcount on the associated algorithm.
4390 */
4391 -struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags);
4392 +struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, __u32 tfm_flags);
4393 void crypto_free_tfm(struct crypto_tfm *tfm);
4395 /*
4396 @@ -219,7 +219,7 @@
4397 return module_name(tfm->__crt_alg->cra_module);
4398 }
4400 -static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
4401 +static inline __u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
4402 {
4403 return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
4404 }
4405 @@ -270,7 +270,7 @@
4406 tfm->crt_digest.dit_update(tfm, sg, nsg);
4407 }
4409 -static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
4410 +static inline void crypto_digest_final(struct crypto_tfm *tfm, __u8 *out)
4411 {
4412 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
4413 tfm->crt_digest.dit_final(tfm, out);
4414 @@ -278,14 +278,14 @@
4416 static inline void crypto_digest_digest(struct crypto_tfm *tfm,
4417 struct scatterlist *sg,
4418 - unsigned int nsg, u8 *out)
4419 + unsigned int nsg, __u8 *out)
4420 {
4421 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
4422 tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
4423 }
4425 static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
4426 - const u8 *key, unsigned int keylen)
4427 + const __u8 *key, unsigned int keylen)
4428 {
4429 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
4430 if (tfm->crt_digest.dit_setkey == NULL)
4431 @@ -294,7 +294,7 @@
4432 }
4434 static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
4435 - const u8 *key, unsigned int keylen)
4436 + const __u8 *key, unsigned int keylen)
4437 {
4438 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
4439 return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
4440 @@ -312,7 +312,7 @@
4441 static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
4442 struct scatterlist *dst,
4443 struct scatterlist *src,
4444 - unsigned int nbytes, u8 *iv)
4445 + unsigned int nbytes, __u8 *iv)
4446 {
4447 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
4448 BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
4449 @@ -331,7 +331,7 @@
4450 static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
4451 struct scatterlist *dst,
4452 struct scatterlist *src,
4453 - unsigned int nbytes, u8 *iv)
4454 + unsigned int nbytes, __u8 *iv)
4455 {
4456 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
4457 BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
4458 @@ -339,30 +339,30 @@
4459 }
4461 static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
4462 - const u8 *src, unsigned int len)
4463 + const __u8 *src, unsigned int len)
4464 {
4465 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
4466 memcpy(tfm->crt_cipher.cit_iv, src, len);
4467 }
4469 static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
4470 - u8 *dst, unsigned int len)
4471 + __u8 *dst, unsigned int len)
4472 {
4473 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
4474 memcpy(dst, tfm->crt_cipher.cit_iv, len);
4475 }
4477 static inline int crypto_comp_compress(struct crypto_tfm *tfm,
4478 - const u8 *src, unsigned int slen,
4479 - u8 *dst, unsigned int *dlen)
4480 + const __u8 *src, unsigned int slen,
4481 + __u8 *dst, unsigned int *dlen)
4482 {
4483 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
4484 return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
4485 }
4487 static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
4488 - const u8 *src, unsigned int slen,
4489 - u8 *dst, unsigned int *dlen)
4490 + const __u8 *src, unsigned int slen,
4491 + __u8 *dst, unsigned int *dlen)
4492 {
4493 BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
4494 return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
4495 @@ -372,13 +372,13 @@
4496 * HMAC support.
4497 */
4498 #ifdef CONFIG_CRYPTO_HMAC
4499 -void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
4500 +void crypto_hmac_init(struct crypto_tfm *tfm, __u8 *key, unsigned int *keylen);
4501 void crypto_hmac_update(struct crypto_tfm *tfm,
4502 struct scatterlist *sg, unsigned int nsg);
4503 -void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
4504 - unsigned int *keylen, u8 *out);
4505 -void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
4506 - struct scatterlist *sg, unsigned int nsg, u8 *out);
4507 +void crypto_hmac_final(struct crypto_tfm *tfm, __u8 *key,
4508 + unsigned int *keylen, __u8 *out);
4509 +void crypto_hmac(struct crypto_tfm *tfm, __u8 *key, unsigned int *keylen,
4510 + struct scatterlist *sg, unsigned int nsg, __u8 *out);
4511 #endif /* CONFIG_CRYPTO_HMAC */
4513 #endif /* _LINUX_CRYPTO_H */
4514 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cycx_drv.h linux-libc-headers-2.6.8.0/include/linux/cycx_drv.h
4515 --- linux-libc-headers-2.6.8.0-dist/include/linux/cycx_drv.h 2003-12-15 12:46:57.000000000 -0600
4516 +++ linux-libc-headers-2.6.8.0/include/linux/cycx_drv.h 2004-08-26 05:41:49.000000000 -0500
4517 @@ -14,9 +14,9 @@
4518 * ============================================================================
4519 * 1999/10/23 acme cycxhw_t cleanup
4520 * 1999/01/03 acme more judicious use of data types...
4521 -* uclong, ucchar, etc deleted, the u8, u16, u32
4522 +* uclong, ucchar, etc deleted, the __u8, __u16, __u32
4523 * types are the portable way to go.
4524 -* 1999/01/03 acme judicious use of data types... u16, u32, etc
4525 +* 1999/01/03 acme judicious use of data types... __u16, __u32, etc
4526 * 1998/12/26 acme FIXED_BUFFERS, CONF_OFFSET,
4527 * removal of cy_read{bwl}
4528 * 1998/08/08 acme Initial version.
4529 @@ -46,18 +46,18 @@
4530 * @reserved - reserved for future use
4531 */
4532 struct cycx_hw {
4533 - u32 fwid;
4534 + __u32 fwid;
4535 int irq;
4536 void *dpmbase;
4537 - u32 dpmsize;
4538 - u32 reserved[5];
4539 + __u32 dpmsize;
4540 + __u32 reserved[5];
4541 };
4543 /* Function Prototypes */
4544 -extern int cycx_setup(struct cycx_hw *hw, void *sfm, u32 len);
4545 +extern int cycx_setup(struct cycx_hw *hw, void *sfm, __u32 len);
4546 extern int cycx_down(struct cycx_hw *hw);
4547 -extern int cycx_peek(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
4548 -extern int cycx_poke(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
4549 +extern int cycx_peek(struct cycx_hw *hw, __u32 addr, void *buf, __u32 len);
4550 +extern int cycx_poke(struct cycx_hw *hw, __u32 addr, void *buf, __u32 len);
4551 extern int cycx_exec(void *addr);
4553 extern void cycx_inten(struct cycx_hw *hw);
4554 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cycx_x25.h linux-libc-headers-2.6.8.0/include/linux/cycx_x25.h
4555 --- linux-libc-headers-2.6.8.0-dist/include/linux/cycx_x25.h 2003-12-15 12:46:58.000000000 -0600
4556 +++ linux-libc-headers-2.6.8.0/include/linux/cycx_x25.h 2004-08-26 05:41:49.000000000 -0500
4557 @@ -38,10 +38,10 @@
4558 /* Data Structures */
4559 /* X.25 Command Block. */
4560 struct cycx_x25_cmd {
4561 - u16 command PACKED;
4562 - u16 link PACKED; /* values: 0 or 1 */
4563 - u16 len PACKED; /* values: 0 thru 0x205 (517) */
4564 - u32 buf PACKED;
4565 + __u16 command PACKED;
4566 + __u16 link PACKED; /* values: 0 or 1 */
4567 + __u16 len PACKED; /* values: 0 thru 0x205 (517) */
4568 + __u32 buf PACKED;
4569 };
4571 /* Defines for the 'command' field. */
4572 @@ -92,34 +92,34 @@
4573 * @flags - see dosx25.doc, in portuguese, for details
4574 */
4575 struct cycx_x25_config {
4576 - u8 link PACKED;
4577 - u8 speed PACKED;
4578 - u8 clock PACKED;
4579 - u8 n2 PACKED;
4580 - u8 n2win PACKED;
4581 - u8 n3win PACKED;
4582 - u8 nvc PACKED;
4583 - u8 pktlen PACKED;
4584 - u8 locaddr PACKED;
4585 - u8 remaddr PACKED;
4586 - u16 t1 PACKED;
4587 - u16 t2 PACKED;
4588 - u8 t21 PACKED;
4589 - u8 npvc PACKED;
4590 - u8 t23 PACKED;
4591 - u8 flags PACKED;
4592 + __u8 link PACKED;
4593 + __u8 speed PACKED;
4594 + __u8 clock PACKED;
4595 + __u8 n2 PACKED;
4596 + __u8 n2win PACKED;
4597 + __u8 n3win PACKED;
4598 + __u8 nvc PACKED;
4599 + __u8 pktlen PACKED;
4600 + __u8 locaddr PACKED;
4601 + __u8 remaddr PACKED;
4602 + __u16 t1 PACKED;
4603 + __u16 t2 PACKED;
4604 + __u8 t21 PACKED;
4605 + __u8 npvc PACKED;
4606 + __u8 t23 PACKED;
4607 + __u8 flags PACKED;
4608 };
4610 struct cycx_x25_stats {
4611 - u16 rx_crc_errors PACKED;
4612 - u16 rx_over_errors PACKED;
4613 - u16 n2_tx_frames PACKED;
4614 - u16 n2_rx_frames PACKED;
4615 - u16 tx_timeouts PACKED;
4616 - u16 rx_timeouts PACKED;
4617 - u16 n3_tx_packets PACKED;
4618 - u16 n3_rx_packets PACKED;
4619 - u16 tx_aborts PACKED;
4620 - u16 rx_aborts PACKED;
4621 + __u16 rx_crc_errors PACKED;
4622 + __u16 rx_over_errors PACKED;
4623 + __u16 n2_tx_frames PACKED;
4624 + __u16 n2_rx_frames PACKED;
4625 + __u16 tx_timeouts PACKED;
4626 + __u16 rx_timeouts PACKED;
4627 + __u16 n3_tx_packets PACKED;
4628 + __u16 n3_rx_packets PACKED;
4629 + __u16 tx_aborts PACKED;
4630 + __u16 rx_aborts PACKED;
4631 };
4632 #endif /* _CYCX_X25_H */
4633 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/device.h linux-libc-headers-2.6.8.0/include/linux/device.h
4634 --- linux-libc-headers-2.6.8.0-dist/include/linux/device.h 2004-08-18 13:16:02.000000000 -0500
4635 +++ linux-libc-headers-2.6.8.0/include/linux/device.h 2004-08-26 05:41:49.000000000 -0500
4636 @@ -57,7 +57,7 @@
4637 struct device * (*add) (struct device * parent, char * bus_id);
4638 int (*hotplug) (struct device *dev, char **envp,
4639 int num_envp, char *buffer, int buffer_size);
4640 - int (*suspend)(struct device * dev, u32 state);
4641 + int (*suspend)(struct device * dev, __u32 state);
4642 int (*resume)(struct device * dev);
4643 };
4645 @@ -105,8 +105,8 @@
4646 int (*probe) (struct device * dev);
4647 int (*remove) (struct device * dev);
4648 void (*shutdown) (struct device * dev);
4649 - int (*suspend) (struct device * dev, u32 state, u32 level);
4650 - int (*resume) (struct device * dev, u32 level);
4651 + int (*suspend) (struct device * dev, __u32 state, __u32 level);
4652 + int (*resume) (struct device * dev, __u32 level);
4653 };
4656 @@ -262,17 +262,17 @@
4657 void *platform_data; /* Platform specific data (e.g. ACPI,
4658 BIOS data relevant to device) */
4659 struct dev_pm_info power;
4660 - u32 power_state; /* Current operating state. In
4661 + __u32 power_state; /* Current operating state. In
4662 ACPI-speak, this is D0-D3, D0
4663 being fully functional, and D3
4664 being off. */
4666 unsigned char *saved_state; /* saved device state */
4667 - u32 detach_state; /* State to enter when device is
4668 + __u32 detach_state; /* State to enter when device is
4669 detached from its driver. */
4671 - u64 *dma_mask; /* dma mask (if dma'able device) */
4672 - u64 coherent_dma_mask;/* Like dma_mask, but for
4673 + __u64 *dma_mask; /* dma mask (if dma'able device) */
4674 + __u64 coherent_dma_mask;/* Like dma_mask, but for
4675 alloc_coherent mappings as
4676 not all hardware supports
4677 64 bit addresses for consistent
4678 @@ -360,9 +360,9 @@
4680 struct platform_device {
4681 char * name;
4682 - u32 id;
4683 + __u32 id;
4684 struct device dev;
4685 - u32 num_resources;
4686 + __u32 num_resources;
4687 struct resource * resource;
4688 };
4690 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/divert.h linux-libc-headers-2.6.8.0/include/linux/divert.h
4691 --- linux-libc-headers-2.6.8.0-dist/include/linux/divert.h 2004-06-09 07:00:49.000000000 -0500
4692 +++ linux-libc-headers-2.6.8.0/include/linux/divert.h 2004-08-26 05:41:49.000000000 -0500
4693 @@ -27,10 +27,10 @@
4694 {
4695 int divert; /* are we active */
4696 unsigned int protos; /* protocols */
4697 - u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
4698 - u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
4699 - u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
4700 - u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
4701 + __u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
4702 + __u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
4703 + __u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
4704 + __u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
4705 };
4707 /*
4708 @@ -40,12 +40,12 @@
4710 typedef union _divert_cf_arg
4711 {
4712 - s16 int16;
4713 - u16 uint16;
4714 - s32 int32;
4715 - u32 uint32;
4716 - s64 int64;
4717 - u64 uint64;
4718 + __s16 int16;
4719 + __u16 uint16;
4720 + __s32 int32;
4721 + __u32 uint32;
4722 + __s64 int64;
4723 + __u64 uint64;
4724 void *ptr;
4725 } divert_cf_arg;
4727 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/eeprom.h linux-libc-headers-2.6.8.0/include/linux/eeprom.h
4728 --- linux-libc-headers-2.6.8.0-dist/include/linux/eeprom.h 2003-12-19 07:05:15.000000000 -0600
4729 +++ linux-libc-headers-2.6.8.0/include/linux/eeprom.h 2004-08-26 13:26:38.000000000 -0500
4730 @@ -26,15 +26,15 @@
4731 unsigned ee_state;
4733 spinlock_t *lock;
4734 - u32 *cache;
4735 + __u32 *cache;
4736 };
4739 -u8 eeprom_readb(struct eeprom *ee, unsigned address);
4740 -void eeprom_read(struct eeprom *ee, unsigned address, u8 *bytes,
4741 +__u8 eeprom_readb(struct eeprom *ee, unsigned address);
4742 +void eeprom_read(struct eeprom *ee, unsigned address, __u8 *bytes,
4743 unsigned count);
4744 -void eeprom_writeb(struct eeprom *ee, unsigned address, u8 data);
4745 -void eeprom_write(struct eeprom *ee, unsigned address, u8 *bytes,
4746 +void eeprom_writeb(struct eeprom *ee, unsigned address, __u8 data);
4747 +void eeprom_write(struct eeprom *ee, unsigned address, __u8 *bytes,
4748 unsigned count);
4750 /* The EEPROM commands include the alway-set leading bit. */
4751 @@ -56,10 +56,10 @@
4752 }
4754 /* foo. put this in a .c file */
4755 -static inline void eeprom_update(struct eeprom *ee, u32 mask, int pol)
4756 +static inline void eeprom_update(struct eeprom *ee, __u32 mask, int pol)
4757 {
4758 unsigned long flags;
4759 - u32 data;
4760 + __u32 data;
4762 spin_lock_irqsave(ee->lock, flags);
4763 data = *ee->cache;
4764 @@ -106,17 +106,17 @@
4765 eeprom_update(ee, ee->eedi, pol);
4766 }
4768 -u16 eeprom_readw(struct eeprom *ee, unsigned address)
4769 +__u16 eeprom_readw(struct eeprom *ee, unsigned address)
4770 {
4771 unsigned i;
4772 - u16 res = 0;
4773 + __u16 res = 0;
4775 eeprom_clk_lo(ee);
4776 eeprom_update(ee, ee->eesel, 1 ^ !!(ee->polarity & EEPOL_EESEL));
4777 eeprom_send_addr(ee, address);
4779 for (i=0; i<16; i++) {
4780 - u32 data;
4781 + __u32 data;
4782 eeprom_clk_hi(ee);
4783 res <<= 1;
4784 data = readl(ee->addr);
4785 @@ -130,6 +130,6 @@
4786 }
4789 -void eeprom_writeb(struct eeprom *ee, unsigned address, u8 data)
4790 +void eeprom_writeb(struct eeprom *ee, unsigned address, __u8 data)
4791 {
4792 }
4793 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/efi.h linux-libc-headers-2.6.8.0/include/linux/efi.h
4794 --- linux-libc-headers-2.6.8.0-dist/include/linux/efi.h 2004-08-18 13:16:02.000000000 -0500
4795 +++ linux-libc-headers-2.6.8.0/include/linux/efi.h 2004-08-26 05:42:08.000000000 -0500
4796 @@ -30,12 +30,12 @@
4797 #define EFI_NOT_FOUND (14 | (1UL << (BITS_PER_LONG-1)))
4799 typedef unsigned long efi_status_t;
4800 -typedef u8 efi_bool_t;
4801 -typedef u16 efi_char16_t; /* UNICODE character */
4802 +typedef __u8 efi_bool_t;
4803 +typedef __u16 efi_char16_t; /* UNICODE character */
4806 typedef struct {
4807 - u8 b[16];
4808 + __u8 b[16];
4809 } efi_guid_t;
4811 #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
4812 @@ -49,11 +49,11 @@
4813 * Generic EFI table header
4814 */
4815 typedef struct {
4816 - u64 signature;
4817 - u32 revision;
4818 - u32 headersize;
4819 - u32 crc32;
4820 - u32 reserved;
4821 + __u64 signature;
4822 + __u32 revision;
4823 + __u32 headersize;
4824 + __u32 crc32;
4825 + __u32 reserved;
4826 } efi_table_hdr_t;
4828 /*
4829 @@ -78,14 +78,14 @@
4830 #define EFI_MAX_MEMORY_TYPE 14
4832 /* Attribute values: */
4833 -#define EFI_MEMORY_UC ((u64)0x0000000000000001ULL) /* uncached */
4834 -#define EFI_MEMORY_WC ((u64)0x0000000000000002ULL) /* write-coalescing */
4835 -#define EFI_MEMORY_WT ((u64)0x0000000000000004ULL) /* write-through */
4836 -#define EFI_MEMORY_WB ((u64)0x0000000000000008ULL) /* write-back */
4837 -#define EFI_MEMORY_WP ((u64)0x0000000000001000ULL) /* write-protect */
4838 -#define EFI_MEMORY_RP ((u64)0x0000000000002000ULL) /* read-protect */
4839 -#define EFI_MEMORY_XP ((u64)0x0000000000004000ULL) /* execute-protect */
4840 -#define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */
4841 +#define EFI_MEMORY_UC ((__u64)0x0000000000000001ULL) /* uncached */
4842 +#define EFI_MEMORY_WC ((__u64)0x0000000000000002ULL) /* write-coalescing */
4843 +#define EFI_MEMORY_WT ((__u64)0x0000000000000004ULL) /* write-through */
4844 +#define EFI_MEMORY_WB ((__u64)0x0000000000000008ULL) /* write-back */
4845 +#define EFI_MEMORY_WP ((__u64)0x0000000000001000ULL) /* write-protect */
4846 +#define EFI_MEMORY_RP ((__u64)0x0000000000002000ULL) /* read-protect */
4847 +#define EFI_MEMORY_XP ((__u64)0x0000000000004000ULL) /* execute-protect */
4848 +#define EFI_MEMORY_RUNTIME ((__u64)0x8000000000000000ULL) /* range requires runtime mapping */
4849 #define EFI_MEMORY_DESCRIPTOR_VERSION 1
4851 #define EFI_PAGE_SHIFT 12
4852 @@ -96,14 +96,14 @@
4853 * the case in ia64. Need to have this fixed in the f/w.
4854 */
4855 typedef struct {
4856 - u32 type;
4857 - u32 pad;
4858 - u64 phys_addr;
4859 - u64 virt_addr;
4860 - u64 num_pages;
4861 - u64 attribute;
4862 + __u32 type;
4863 + __u32 pad;
4864 + __u64 phys_addr;
4865 + __u64 virt_addr;
4866 + __u64 num_pages;
4867 + __u64 attribute;
4868 #if defined (__i386__)
4869 - u64 pad1;
4870 + __u64 pad1;
4871 #endif
4872 } efi_memory_desc_t;
4874 @@ -117,23 +117,23 @@
4875 #define EFI_UNSPECIFIED_TIMEZONE 0x07ff
4877 typedef struct {
4878 - u16 year;
4879 - u8 month;
4880 - u8 day;
4881 - u8 hour;
4882 - u8 minute;
4883 - u8 second;
4884 - u8 pad1;
4885 - u32 nanosecond;
4886 - s16 timezone;
4887 - u8 daylight;
4888 - u8 pad2;
4889 + __u16 year;
4890 + __u8 month;
4891 + __u8 day;
4892 + __u8 hour;
4893 + __u8 minute;
4894 + __u8 second;
4895 + __u8 pad1;
4896 + __u32 nanosecond;
4897 + __s16 timezone;
4898 + __u8 daylight;
4899 + __u8 pad2;
4900 } efi_time_t;
4902 typedef struct {
4903 - u32 resolution;
4904 - u32 accuracy;
4905 - u8 sets_to_zero;
4906 + __u32 resolution;
4907 + __u32 accuracy;
4908 + __u8 sets_to_zero;
4909 } efi_time_cap_t;
4911 /*
4912 @@ -146,7 +146,7 @@
4913 /*
4914 * EFI Runtime Services table
4915 */
4916 -#define EFI_RUNTIME_SERVICES_SIGNATURE ((u64)0x5652453544e5552ULL)
4917 +#define EFI_RUNTIME_SERVICES_SIGNATURE ((__u64)0x5652453544e5552ULL)
4918 #define EFI_RUNTIME_SERVICES_REVISION 0x00010000
4920 typedef struct {
4921 @@ -169,19 +169,19 @@
4922 typedef efi_status_t efi_get_wakeup_time_t (efi_bool_t *enabled, efi_bool_t *pending,
4923 efi_time_t *tm);
4924 typedef efi_status_t efi_set_wakeup_time_t (efi_bool_t enabled, efi_time_t *tm);
4925 -typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, u32 *attr,
4926 +typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, __u32 *attr,
4927 unsigned long *data_size, void *data);
4928 typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char16_t *name,
4929 efi_guid_t *vendor);
4930 typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor,
4931 unsigned long attr, unsigned long data_size,
4932 void *data);
4933 -typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
4934 +typedef efi_status_t efi_get_next_high_mono_count_t (__u32 *count);
4935 typedef void efi_reset_system_t (int reset_type, efi_status_t status,
4936 unsigned long data_size, efi_char16_t *data);
4937 typedef efi_status_t efi_set_virtual_address_map_t (unsigned long memory_map_size,
4938 unsigned long descriptor_size,
4939 - u32 descriptor_version,
4940 + __u32 descriptor_version,
4941 efi_memory_desc_t *virtual_map);
4943 /*
4944 @@ -219,13 +219,13 @@
4945 unsigned long table;
4946 } efi_config_table_t;
4948 -#define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
4949 +#define EFI_SYSTEM_TABLE_SIGNATURE ((__u64)0x5453595320494249ULL)
4950 #define EFI_SYSTEM_TABLE_REVISION ((1 << 16) | 00)
4952 typedef struct {
4953 efi_table_hdr_t hdr;
4954 unsigned long fw_vendor; /* physical addr of CHAR16 vendor string */
4955 - u32 fw_revision;
4956 + __u32 fw_revision;
4957 unsigned long con_in_handle;
4958 unsigned long con_in;
4959 unsigned long con_out_handle;
4960 @@ -293,9 +293,9 @@
4961 extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
4962 extern void efi_gettimeofday (struct timespec *ts);
4963 extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */
4964 -extern u64 efi_get_iobase (void);
4965 -extern u32 efi_mem_type (unsigned long phys_addr);
4966 -extern u64 efi_mem_attributes (unsigned long phys_addr);
4967 +extern __u64 efi_get_iobase (void);
4968 +extern __u32 efi_mem_type (unsigned long phys_addr);
4969 +extern __u64 efi_mem_attributes (unsigned long phys_addr);
4970 extern int __init efi_uart_console_only (void);
4971 extern void efi_initialize_iomem_resources(struct resource *code_resource,
4972 struct resource *data_resource);
4973 @@ -368,9 +368,9 @@
4974 #define EFI_DEV_END_ENTIRE 0xFF
4976 struct efi_generic_dev_path {
4977 - u8 type;
4978 - u8 sub_type;
4979 - u16 length;
4980 + __u8 type;
4981 + __u8 sub_type;
4982 + __u16 length;
4983 } __attribute ((packed));
4985 #endif /* _LINUX_EFI_H */
4986 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/eisa.h linux-libc-headers-2.6.8.0/include/linux/eisa.h
4987 --- linux-libc-headers-2.6.8.0-dist/include/linux/eisa.h 2003-12-15 12:46:58.000000000 -0600
4988 +++ linux-libc-headers-2.6.8.0/include/linux/eisa.h 2004-08-26 05:42:08.000000000 -0500
4989 @@ -43,7 +43,7 @@
4990 int state;
4991 unsigned long base_addr;
4992 struct resource res[EISA_MAX_RESOURCES];
4993 - u64 dma_mask;
4994 + __u64 dma_mask;
4995 struct device dev; /* generic device */
4996 #ifdef CONFIG_EISA_NAMES
4997 char pretty_name[DEVICE_NAME_SIZE];
4998 @@ -91,7 +91,7 @@
4999 unsigned long bus_base_addr;
5000 int slots; /* Max slot number */
5001 int force_probe; /* Probe even when no slot 0 */
5002 - u64 dma_mask; /* from bridge device */
5003 + __u64 dma_mask; /* from bridge device */
5004 int bus_nr; /* Set by eisa_root_register */
5005 struct resource eisa_root_res; /* ditto */
5006 };
5007 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/ethtool.h linux-libc-headers-2.6.8.0/include/linux/ethtool.h
5008 --- linux-libc-headers-2.6.8.0-dist/include/linux/ethtool.h 2004-06-23 16:52:54.000000000 -0500
5009 +++ linux-libc-headers-2.6.8.0/include/linux/ethtool.h 2004-08-26 13:29:11.000000000 -0500
5010 @@ -15,24 +15,24 @@
5012 /* This should work for both 32 and 64 bit userland. */
5013 struct ethtool_cmd {
5014 - u32 cmd;
5015 - u32 supported; /* Features this interface supports */
5016 - u32 advertising; /* Features this interface advertises */
5017 - u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
5018 - u8 duplex; /* Duplex, half or full */
5019 - u8 port; /* Which connector port */
5020 - u8 phy_address;
5021 - u8 transceiver; /* Which transceiver to use */
5022 - u8 autoneg; /* Enable or disable autonegotiation */
5023 - u32 maxtxpkt; /* Tx pkts before generating tx int */
5024 - u32 maxrxpkt; /* Rx pkts before generating rx int */
5025 - u32 reserved[4];
5026 + __u32 cmd;
5027 + __u32 supported; /* Features this interface supports */
5028 + __u32 advertising; /* Features this interface advertises */
5029 + __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
5030 + __u8 duplex; /* Duplex, half or full */
5031 + __u8 port; /* Which connector port */
5032 + __u8 phy_address;
5033 + __u8 transceiver; /* Which transceiver to use */
5034 + __u8 autoneg; /* Enable or disable autonegotiation */
5035 + __u32 maxtxpkt; /* Tx pkts before generating tx int */
5036 + __u32 maxrxpkt; /* Rx pkts before generating rx int */
5037 + __u32 reserved[4];
5038 };
5040 #define ETHTOOL_BUSINFO_LEN 32
5041 /* these strings are set to whatever the driver author decides... */
5042 struct ethtool_drvinfo {
5043 - u32 cmd;
5044 + __u32 cmd;
5045 char driver[32]; /* driver short name, "tulip", "eepro100" */
5046 char version[32]; /* driver version string */
5047 char fw_version[32]; /* firmware version string, if applicable */
5048 @@ -40,53 +40,53 @@
5049 /* For PCI devices, use pci_name(pci_dev). */
5050 char reserved1[32];
5051 char reserved2[16];
5052 - u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
5053 - u32 testinfo_len;
5054 - u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
5055 - u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
5056 + __u32 n_stats; /* number of __u64's from ETHTOOL_GSTATS */
5057 + __u32 testinfo_len;
5058 + __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
5059 + __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
5060 };
5062 #define SOPASS_MAX 6
5063 /* wake-on-lan settings */
5064 struct ethtool_wolinfo {
5065 - u32 cmd;
5066 - u32 supported;
5067 - u32 wolopts;
5068 - u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
5069 + __u32 cmd;
5070 + __u32 supported;
5071 + __u32 wolopts;
5072 + __u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
5073 };
5075 /* for passing single values */
5076 struct ethtool_value {
5077 - u32 cmd;
5078 - u32 data;
5079 + __u32 cmd;
5080 + __u32 data;
5081 };
5083 /* for passing big chunks of data */
5084 struct ethtool_regs {
5085 - u32 cmd;
5086 - u32 version; /* driver-specific, indicates different chips/revs */
5087 - u32 len; /* bytes */
5088 - u8 data[0];
5089 + __u32 cmd;
5090 + __u32 version; /* driver-specific, indicates different chips/revs */
5091 + __u32 len; /* bytes */
5092 + __u8 data[0];
5093 };
5095 /* for passing EEPROM chunks */
5096 struct ethtool_eeprom {
5097 - u32 cmd;
5098 - u32 magic;
5099 - u32 offset; /* in bytes */
5100 - u32 len; /* in bytes */
5101 - u8 data[0];
5102 + __u32 cmd;
5103 + __u32 magic;
5104 + __u32 offset; /* in bytes */
5105 + __u32 len; /* in bytes */
5106 + __u8 data[0];
5107 };
5109 /* for configuring coalescing parameters of chip */
5110 struct ethtool_coalesce {
5111 - u32 cmd; /* ETHTOOL_{G,S}COALESCE */
5112 + __u32 cmd; /* ETHTOOL_{G,S}COALESCE */
5114 /* How many usecs to delay an RX interrupt after
5115 * a packet arrives. If 0, only rx_max_coalesced_frames
5116 * is used.
5117 */
5118 - u32 rx_coalesce_usecs;
5119 + __u32 rx_coalesce_usecs;
5121 /* How many packets to delay an RX interrupt after
5122 * a packet arrives. If 0, only rx_coalesce_usecs is
5123 @@ -94,21 +94,21 @@
5124 * to zero as this would cause RX interrupts to never be
5125 * generated.
5126 */
5127 - u32 rx_max_coalesced_frames;
5128 + __u32 rx_max_coalesced_frames;
5130 /* Same as above two parameters, except that these values
5131 * apply while an IRQ is being serviced by the host. Not
5132 * all cards support this feature and the values are ignored
5133 * in that case.
5134 */
5135 - u32 rx_coalesce_usecs_irq;
5136 - u32 rx_max_coalesced_frames_irq;
5137 + __u32 rx_coalesce_usecs_irq;
5138 + __u32 rx_max_coalesced_frames_irq;
5140 /* How many usecs to delay a TX interrupt after
5141 * a packet is sent. If 0, only tx_max_coalesced_frames
5142 * is used.
5143 */
5144 - u32 tx_coalesce_usecs;
5145 + __u32 tx_coalesce_usecs;
5147 /* How many packets to delay a TX interrupt after
5148 * a packet is sent. If 0, only tx_coalesce_usecs is
5149 @@ -116,22 +116,22 @@
5150 * to zero as this would cause TX interrupts to never be
5151 * generated.
5152 */
5153 - u32 tx_max_coalesced_frames;
5154 + __u32 tx_max_coalesced_frames;
5156 /* Same as above two parameters, except that these values
5157 * apply while an IRQ is being serviced by the host. Not
5158 * all cards support this feature and the values are ignored
5159 * in that case.
5160 */
5161 - u32 tx_coalesce_usecs_irq;
5162 - u32 tx_max_coalesced_frames_irq;
5163 + __u32 tx_coalesce_usecs_irq;
5164 + __u32 tx_max_coalesced_frames_irq;
5166 /* How many usecs to delay in-memory statistics
5167 * block updates. Some drivers do not have an in-memory
5168 * statistic block, and in such cases this value is ignored.
5169 * This value must not be zero.
5170 */
5171 - u32 stats_block_coalesce_usecs;
5172 + __u32 stats_block_coalesce_usecs;
5174 /* Adaptive RX/TX coalescing is an algorithm implemented by
5175 * some drivers to improve latency under low packet rates and
5176 @@ -140,18 +140,18 @@
5177 * not implemented by the driver causes these values to be
5178 * silently ignored.
5179 */
5180 - u32 use_adaptive_rx_coalesce;
5181 - u32 use_adaptive_tx_coalesce;
5182 + __u32 use_adaptive_rx_coalesce;
5183 + __u32 use_adaptive_tx_coalesce;
5185 /* When the packet rate (measured in packets per second)
5186 * is below pkt_rate_low, the {rx,tx}_*_low parameters are
5187 * used.
5188 */
5189 - u32 pkt_rate_low;
5190 - u32 rx_coalesce_usecs_low;
5191 - u32 rx_max_coalesced_frames_low;
5192 - u32 tx_coalesce_usecs_low;
5193 - u32 tx_max_coalesced_frames_low;
5194 + __u32 pkt_rate_low;
5195 + __u32 rx_coalesce_usecs_low;
5196 + __u32 rx_max_coalesced_frames_low;
5197 + __u32 tx_coalesce_usecs_low;
5198 + __u32 tx_max_coalesced_frames_low;
5200 /* When the packet rate is below pkt_rate_high but above
5201 * pkt_rate_low (both measured in packets per second) the
5202 @@ -162,43 +162,43 @@
5203 * is above pkt_rate_high, the {rx,tx}_*_high parameters are
5204 * used.
5205 */
5206 - u32 pkt_rate_high;
5207 - u32 rx_coalesce_usecs_high;
5208 - u32 rx_max_coalesced_frames_high;
5209 - u32 tx_coalesce_usecs_high;
5210 - u32 tx_max_coalesced_frames_high;
5211 + __u32 pkt_rate_high;
5212 + __u32 rx_coalesce_usecs_high;
5213 + __u32 rx_max_coalesced_frames_high;
5214 + __u32 tx_coalesce_usecs_high;
5215 + __u32 tx_max_coalesced_frames_high;
5217 /* How often to do adaptive coalescing packet rate sampling,
5218 * measured in seconds. Must not be zero.
5219 */
5220 - u32 rate_sample_interval;
5221 + __u32 rate_sample_interval;
5222 };
5224 /* for configuring RX/TX ring parameters */
5225 struct ethtool_ringparam {
5226 - u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */
5227 + __u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */
5229 /* Read only attributes. These indicate the maximum number
5230 * of pending RX/TX ring entries the driver will allow the
5231 * user to set.
5232 */
5233 - u32 rx_max_pending;
5234 - u32 rx_mini_max_pending;
5235 - u32 rx_jumbo_max_pending;
5236 - u32 tx_max_pending;
5237 + __u32 rx_max_pending;
5238 + __u32 rx_mini_max_pending;
5239 + __u32 rx_jumbo_max_pending;
5240 + __u32 tx_max_pending;
5242 /* Values changeable by the user. The valid values are
5243 * in the range 1 to the "*_max_pending" counterpart above.
5244 */
5245 - u32 rx_pending;
5246 - u32 rx_mini_pending;
5247 - u32 rx_jumbo_pending;
5248 - u32 tx_pending;
5249 + __u32 rx_pending;
5250 + __u32 rx_mini_pending;
5251 + __u32 rx_jumbo_pending;
5252 + __u32 tx_pending;
5253 };
5255 /* for configuring link flow control parameters */
5256 struct ethtool_pauseparam {
5257 - u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */
5258 + __u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */
5260 /* If the link is being auto-negotiated (via ethtool_cmd.autoneg
5261 * being true) the user may set 'autonet' here non-zero to have the
5262 @@ -210,9 +210,9 @@
5263 * then {rx,tx}_pause force the driver to use/not-use pause
5264 * flow control.
5265 */
5266 - u32 autoneg;
5267 - u32 rx_pause;
5268 - u32 tx_pause;
5269 + __u32 autoneg;
5270 + __u32 rx_pause;
5271 + __u32 tx_pause;
5272 };
5274 #define ETH_GSTRING_LEN 32
5275 @@ -223,10 +223,10 @@
5277 /* for passing string sets for data tagging */
5278 struct ethtool_gstrings {
5279 - u32 cmd; /* ETHTOOL_GSTRINGS */
5280 - u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/
5281 - u32 len; /* number of strings in the string set */
5282 - u8 data[0];
5283 + __u32 cmd; /* ETHTOOL_GSTRINGS */
5284 + __u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/
5285 + __u32 len; /* number of strings in the string set */
5286 + __u8 data[0];
5287 };
5289 enum ethtool_test_flags {
5290 @@ -236,30 +236,30 @@
5292 /* for requesting NIC test and getting results*/
5293 struct ethtool_test {
5294 - u32 cmd; /* ETHTOOL_TEST */
5295 - u32 flags; /* ETH_TEST_FL_xxx */
5296 - u32 reserved;
5297 - u32 len; /* result length, in number of u64 elements */
5298 - u64 data[0];
5299 + __u32 cmd; /* ETHTOOL_TEST */
5300 + __u32 flags; /* ETH_TEST_FL_xxx */
5301 + __u32 reserved;
5302 + __u32 len; /* result length, in number of __u64 elements */
5303 + __u64 data[0];
5304 };
5306 /* for dumping NIC-specific statistics */
5307 struct ethtool_stats {
5308 - u32 cmd; /* ETHTOOL_GSTATS */
5309 - u32 n_stats; /* number of u64's being returned */
5310 - u64 data[0];
5311 + __u32 cmd; /* ETHTOOL_GSTATS */
5312 + __u32 n_stats; /* number of __u64's being returned */
5313 + __u64 data[0];
5314 };
5316 struct net_device;
5318 /* Some generic methods drivers may use in their ethtool_ops */
5319 -u32 ethtool_op_get_link(struct net_device *dev);
5320 -u32 ethtool_op_get_tx_csum(struct net_device *dev);
5321 -int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
5322 -u32 ethtool_op_get_sg(struct net_device *dev);
5323 -int ethtool_op_set_sg(struct net_device *dev, u32 data);
5324 -u32 ethtool_op_get_tso(struct net_device *dev);
5325 -int ethtool_op_set_tso(struct net_device *dev, u32 data);
5326 +__u32 ethtool_op_get_link(struct net_device *dev);
5327 +__u32 ethtool_op_get_tx_csum(struct net_device *dev);
5328 +int ethtool_op_set_tx_csum(struct net_device *dev, __u32 data);
5329 +__u32 ethtool_op_get_sg(struct net_device *dev);
5330 +int ethtool_op_set_sg(struct net_device *dev, __u32 data);
5331 +__u32 ethtool_op_get_tso(struct net_device *dev);
5332 +int ethtool_op_set_tso(struct net_device *dev, __u32 data);
5334 /**
5335 * ðtool_ops - Alter and report network device settings
5336 @@ -324,33 +324,33 @@
5337 void (*get_regs)(struct net_device *, struct ethtool_regs *, void *);
5338 void (*get_wol)(struct net_device *, struct ethtool_wolinfo *);
5339 int (*set_wol)(struct net_device *, struct ethtool_wolinfo *);
5340 - u32 (*get_msglevel)(struct net_device *);
5341 - void (*set_msglevel)(struct net_device *, u32);
5342 + __u32 (*get_msglevel)(struct net_device *);
5343 + void (*set_msglevel)(struct net_device *, __u32);
5344 int (*nway_reset)(struct net_device *);
5345 - u32 (*get_link)(struct net_device *);
5346 + __u32 (*get_link)(struct net_device *);
5347 int (*get_eeprom_len)(struct net_device *);
5348 - int (*get_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
5349 - int (*set_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
5350 + int (*get_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
5351 + int (*set_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
5352 int (*get_coalesce)(struct net_device *, struct ethtool_coalesce *);
5353 int (*set_coalesce)(struct net_device *, struct ethtool_coalesce *);
5354 void (*get_ringparam)(struct net_device *, struct ethtool_ringparam *);
5355 int (*set_ringparam)(struct net_device *, struct ethtool_ringparam *);
5356 void (*get_pauseparam)(struct net_device *, struct ethtool_pauseparam*);
5357 int (*set_pauseparam)(struct net_device *, struct ethtool_pauseparam*);
5358 - u32 (*get_rx_csum)(struct net_device *);
5359 - int (*set_rx_csum)(struct net_device *, u32);
5360 - u32 (*get_tx_csum)(struct net_device *);
5361 - int (*set_tx_csum)(struct net_device *, u32);
5362 - u32 (*get_sg)(struct net_device *);
5363 - int (*set_sg)(struct net_device *, u32);
5364 - u32 (*get_tso)(struct net_device *);
5365 - int (*set_tso)(struct net_device *, u32);
5366 + __u32 (*get_rx_csum)(struct net_device *);
5367 + int (*set_rx_csum)(struct net_device *, __u32);
5368 + __u32 (*get_tx_csum)(struct net_device *);
5369 + int (*set_tx_csum)(struct net_device *, __u32);
5370 + __u32 (*get_sg)(struct net_device *);
5371 + int (*set_sg)(struct net_device *, __u32);
5372 + __u32 (*get_tso)(struct net_device *);
5373 + int (*set_tso)(struct net_device *, __u32);
5374 int (*self_test_count)(struct net_device *);
5375 - void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
5376 - void (*get_strings)(struct net_device *, u32 stringset, u8 *);
5377 - int (*phys_id)(struct net_device *, u32);
5378 + void (*self_test)(struct net_device *, struct ethtool_test *, __u64 *);
5379 + void (*get_strings)(struct net_device *, __u32 stringset, __u8 *);
5380 + int (*phys_id)(struct net_device *, __u32);
5381 int (*get_stats_count)(struct net_device *);
5382 - void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
5383 + void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, __u64 *);
5384 int (*begin)(struct net_device *);
5385 void (*complete)(struct net_device *);
5386 };
5387 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/firmware.h linux-libc-headers-2.6.8.0/include/linux/firmware.h
5388 --- linux-libc-headers-2.6.8.0-dist/include/linux/firmware.h 2003-12-15 12:46:58.000000000 -0600
5389 +++ linux-libc-headers-2.6.8.0/include/linux/firmware.h 2004-08-26 05:42:08.000000000 -0500
5390 @@ -5,7 +5,7 @@
5391 #define FIRMWARE_NAME_MAX 30
5392 struct firmware {
5393 size_t size;
5394 - u8 *data;
5395 + __u8 *data;
5396 };
5397 int request_firmware(const struct firmware **fw, const char *name,
5398 struct device *device);
5399 @@ -15,5 +15,5 @@
5400 void (*cont)(const struct firmware *fw, void *context));
5402 void release_firmware(const struct firmware *fw);
5403 -void register_firmware(const char *name, const u8 *data, size_t size);
5404 +void register_firmware(const char *name, const __u8 *data, size_t size);
5405 #endif
5406 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/fs.h linux-libc-headers-2.6.8.0/include/linux/fs.h
5407 --- linux-libc-headers-2.6.8.0-dist/include/linux/fs.h 2004-08-18 13:16:02.000000000 -0500
5408 +++ linux-libc-headers-2.6.8.0/include/linux/fs.h 2004-08-26 05:42:08.000000000 -0500
5409 @@ -198,7 +198,7 @@
5410 /* A jump here: 108-111 have been used for various private purposes. */
5411 #define BLKBSZGET _IOR(0x12,112,size_t)
5412 #define BLKBSZSET _IOW(0x12,113,size_t)
5413 -#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (u64 *arg) */
5414 +#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (__u64 *arg) */
5416 #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */
5417 #define FIBMAP _IO(0x00,1) /* bmap access */
5418 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/i2c.h linux-libc-headers-2.6.8.0/include/linux/i2c.h
5419 --- linux-libc-headers-2.6.8.0-dist/include/linux/i2c.h 2004-06-23 16:52:54.000000000 -0500
5420 +++ linux-libc-headers-2.6.8.0/include/linux/i2c.h 2004-08-26 05:42:08.000000000 -0500
5421 @@ -70,36 +70,36 @@
5422 and probably just as fast.
5423 Note that we use i2c_adapter here, because you do not need a specific
5424 smbus adapter to call this function. */
5425 -extern s32 i2c_smbus_xfer (struct i2c_adapter * adapter, u16 addr,
5426 +extern __s32 i2c_smbus_xfer (struct i2c_adapter * adapter, __u16 addr,
5427 unsigned short flags,
5428 - char read_write, u8 command, int size,
5429 + char read_write, __u8 command, int size,
5430 union i2c_smbus_data * data);
5432 /* Now follow the 'nice' access routines. These also document the calling
5433 conventions of smbus_access. */
5435 -extern s32 i2c_smbus_write_quick(struct i2c_client * client, u8 value);
5436 -extern s32 i2c_smbus_read_byte(struct i2c_client * client);
5437 -extern s32 i2c_smbus_write_byte(struct i2c_client * client, u8 value);
5438 -extern s32 i2c_smbus_read_byte_data(struct i2c_client * client, u8 command);
5439 -extern s32 i2c_smbus_write_byte_data(struct i2c_client * client,
5440 - u8 command, u8 value);
5441 -extern s32 i2c_smbus_read_word_data(struct i2c_client * client, u8 command);
5442 -extern s32 i2c_smbus_write_word_data(struct i2c_client * client,
5443 - u8 command, u16 value);
5444 -extern s32 i2c_smbus_process_call(struct i2c_client * client,
5445 - u8 command, u16 value);
5446 +extern __s32 i2c_smbus_write_quick(struct i2c_client * client, __u8 value);
5447 +extern __s32 i2c_smbus_read_byte(struct i2c_client * client);
5448 +extern __s32 i2c_smbus_write_byte(struct i2c_client * client, __u8 value);
5449 +extern __s32 i2c_smbus_read_byte_data(struct i2c_client * client, __u8 command);
5450 +extern __s32 i2c_smbus_write_byte_data(struct i2c_client * client,
5451 + __u8 command, __u8 value);
5452 +extern __s32 i2c_smbus_read_word_data(struct i2c_client * client, __u8 command);
5453 +extern __s32 i2c_smbus_write_word_data(struct i2c_client * client,
5454 + __u8 command, __u16 value);
5455 +extern __s32 i2c_smbus_process_call(struct i2c_client * client,
5456 + __u8 command, __u16 value);
5457 /* Returns the number of read bytes */
5458 -extern s32 i2c_smbus_read_block_data(struct i2c_client * client,
5459 - u8 command, u8 *values);
5460 -extern s32 i2c_smbus_write_block_data(struct i2c_client * client,
5461 - u8 command, u8 length,
5462 - u8 *values);
5463 -extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
5464 - u8 command, u8 *values);
5465 -extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
5466 - u8 command, u8 length,
5467 - u8 *values);
5468 +extern __s32 i2c_smbus_read_block_data(struct i2c_client * client,
5469 + __u8 command, __u8 *values);
5470 +extern __s32 i2c_smbus_write_block_data(struct i2c_client * client,
5471 + __u8 command, __u8 length,
5472 + __u8 *values);
5473 +extern __s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
5474 + __u8 command, __u8 *values);
5475 +extern __s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
5476 + __u8 command, __u8 length,
5477 + __u8 *values);
5480 /*
5481 @@ -203,9 +203,9 @@
5482 using common I2C messages */
5483 int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[],
5484 int num);
5485 - int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,
5486 + int (*smbus_xfer) (struct i2c_adapter *adap, __u16 addr,
5487 unsigned short flags, char read_write,
5488 - u8 command, int size, union i2c_smbus_data * data);
5489 + __u8 command, int size, union i2c_smbus_data * data);
5491 /* --- these optional/future use for some adapter types.*/
5492 int (*slave_send)(struct i2c_adapter *,char*,int);
5493 @@ -215,7 +215,7 @@
5494 int (*algo_control)(struct i2c_adapter *, unsigned int, unsigned long);
5496 /* To determine what the adapter supports */
5497 - u32 (*functionality) (struct i2c_adapter *);
5498 + __u32 (*functionality) (struct i2c_adapter *);
5499 };
5501 /*
5502 @@ -381,10 +381,10 @@
5505 /* Return the functionality mask */
5506 -extern u32 i2c_get_functionality (struct i2c_adapter *adap);
5507 +extern __u32 i2c_get_functionality (struct i2c_adapter *adap);
5509 /* Return 1 if adapter supports everything we need, 0 if not. */
5510 -extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
5511 +extern int i2c_check_functionality (struct i2c_adapter *adap, __u32 func);
5513 /*
5514 * I2C Message - used for pure i2c transaction, also from /dev interface
5515 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/i2o-dev.h linux-libc-headers-2.6.8.0/include/linux/i2o-dev.h
5516 --- linux-libc-headers-2.6.8.0-dist/include/linux/i2o-dev.h 2004-06-23 16:52:54.000000000 -0500
5517 +++ linux-libc-headers-2.6.8.0/include/linux/i2o-dev.h 2004-08-26 05:42:08.000000000 -0500
5518 @@ -29,7 +29,7 @@
5519 * I2O Control IOCTLs and structures
5520 */
5521 #define I2O_MAGIC_NUMBER 'i'
5522 -#define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,u8[MAX_I2O_CONTROLLERS])
5523 +#define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,__u8[MAX_I2O_CONTROLLERS])
5524 #define I2OHRTGET _IOWR(I2O_MAGIC_NUMBER,1,struct i2o_cmd_hrtlct)
5525 #define I2OLCTGET _IOWR(I2O_MAGIC_NUMBER,2,struct i2o_cmd_hrtlct)
5526 #define I2OPARMSET _IOWR(I2O_MAGIC_NUMBER,3,struct i2o_cmd_psetget)
5527 @@ -37,7 +37,7 @@
5528 #define I2OSWDL _IOWR(I2O_MAGIC_NUMBER,5,struct i2o_sw_xfer)
5529 #define I2OSWUL _IOWR(I2O_MAGIC_NUMBER,6,struct i2o_sw_xfer)
5530 #define I2OSWDEL _IOWR(I2O_MAGIC_NUMBER,7,struct i2o_sw_xfer)
5531 -#define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,u32)
5532 +#define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,__u32)
5533 #define I2OHTML _IOWR(I2O_MAGIC_NUMBER,9,struct i2o_html)
5534 #define I2OEVTREG _IOW(I2O_MAGIC_NUMBER,10,struct i2o_evt_id)
5535 #define I2OEVTGET _IOR(I2O_MAGIC_NUMBER,11,struct i2o_evt_info)
5536 @@ -129,65 +129,65 @@
5537 #define I2O_BUS_CARDBUS 7
5538 #define I2O_BUS_UNKNOWN 0x80
5540 -typedef unsigned char u8;
5541 -typedef unsigned short u16;
5542 -typedef unsigned int u32;
5543 +typedef unsigned char __u8;
5544 +typedef unsigned short __u16;
5545 +typedef unsigned int __u32;
5547 typedef struct _i2o_pci_bus
5548 {
5549 - u8 PciFunctionNumber;
5550 - u8 PciDeviceNumber;
5551 - u8 PciBusNumber;
5552 - u8 reserved;
5553 - u16 PciVendorID;
5554 - u16 PciDeviceID;
5555 + __u8 PciFunctionNumber;
5556 + __u8 PciDeviceNumber;
5557 + __u8 PciBusNumber;
5558 + __u8 reserved;
5559 + __u16 PciVendorID;
5560 + __u16 PciDeviceID;
5561 } i2o_pci_bus;
5563 typedef struct _i2o_local_bus
5564 {
5565 - u16 LbBaseIOPort;
5566 - u16 reserved;
5567 - u32 LbBaseMemoryAddress;
5568 + __u16 LbBaseIOPort;
5569 + __u16 reserved;
5570 + __u32 LbBaseMemoryAddress;
5571 } i2o_local_bus;
5573 typedef struct _i2o_isa_bus
5574 {
5575 - u16 IsaBaseIOPort;
5576 - u8 CSN;
5577 - u8 reserved;
5578 - u32 IsaBaseMemoryAddress;
5579 + __u16 IsaBaseIOPort;
5580 + __u8 CSN;
5581 + __u8 reserved;
5582 + __u32 IsaBaseMemoryAddress;
5583 } i2o_isa_bus;
5585 typedef struct _i2o_eisa_bus_info
5586 {
5587 - u16 EisaBaseIOPort;
5588 - u8 reserved;
5589 - u8 EisaSlotNumber;
5590 - u32 EisaBaseMemoryAddress;
5591 + __u16 EisaBaseIOPort;
5592 + __u8 reserved;
5593 + __u8 EisaSlotNumber;
5594 + __u32 EisaBaseMemoryAddress;
5595 } i2o_eisa_bus;
5597 typedef struct _i2o_mca_bus
5598 {
5599 - u16 McaBaseIOPort;
5600 - u8 reserved;
5601 - u8 McaSlotNumber;
5602 - u32 McaBaseMemoryAddress;
5603 + __u16 McaBaseIOPort;
5604 + __u8 reserved;
5605 + __u8 McaSlotNumber;
5606 + __u32 McaBaseMemoryAddress;
5607 } i2o_mca_bus;
5609 typedef struct _i2o_other_bus
5610 {
5611 - u16 BaseIOPort;
5612 - u16 reserved;
5613 - u32 BaseMemoryAddress;
5614 + __u16 BaseIOPort;
5615 + __u16 reserved;
5616 + __u32 BaseMemoryAddress;
5617 } i2o_other_bus;
5619 typedef struct _i2o_hrt_entry
5620 {
5621 - u32 adapter_id;
5622 - u32 parent_tid:12;
5623 - u32 state:4;
5624 - u32 bus_num:8;
5625 - u32 bus_type:8;
5626 + __u32 adapter_id;
5627 + __u32 parent_tid:12;
5628 + __u32 state:4;
5629 + __u32 bus_num:8;
5630 + __u32 bus_type:8;
5631 union
5632 {
5633 i2o_pci_bus pci_bus;
5634 @@ -201,69 +201,69 @@
5636 typedef struct _i2o_hrt
5637 {
5638 - u16 num_entries;
5639 - u8 entry_len;
5640 - u8 hrt_version;
5641 - u32 change_ind;
5642 + __u16 num_entries;
5643 + __u8 entry_len;
5644 + __u8 hrt_version;
5645 + __u32 change_ind;
5646 i2o_hrt_entry hrt_entry[1];
5647 } i2o_hrt;
5649 typedef struct _i2o_lct_entry
5650 {
5651 - u32 entry_size:16;
5652 - u32 tid:12;
5653 - u32 reserved:4;
5654 - u32 change_ind;
5655 - u32 device_flags;
5656 - u32 class_id:12;
5657 - u32 version:4;
5658 - u32 vendor_id:16;
5659 - u32 sub_class;
5660 - u32 user_tid:12;
5661 - u32 parent_tid:12;
5662 - u32 bios_info:8;
5663 - u8 identity_tag[8];
5664 - u32 event_capabilities;
5665 + __u32 entry_size:16;
5666 + __u32 tid:12;
5667 + __u32 reserved:4;
5668 + __u32 change_ind;
5669 + __u32 device_flags;
5670 + __u32 class_id:12;
5671 + __u32 version:4;
5672 + __u32 vendor_id:16;
5673 + __u32 sub_class;
5674 + __u32 user_tid:12;
5675 + __u32 parent_tid:12;
5676 + __u32 bios_info:8;
5677 + __u8 identity_tag[8];
5678 + __u32 event_capabilities;
5679 } i2o_lct_entry;
5681 typedef struct _i2o_lct
5682 {
5683 - u32 table_size:16;
5684 - u32 boot_tid:12;
5685 - u32 lct_ver:4;
5686 - u32 iop_flags;
5687 - u32 change_ind;
5688 + __u32 table_size:16;
5689 + __u32 boot_tid:12;
5690 + __u32 lct_ver:4;
5691 + __u32 iop_flags;
5692 + __u32 change_ind;
5693 i2o_lct_entry lct_entry[1];
5694 } i2o_lct;
5696 typedef struct _i2o_status_block
5697 {
5698 - u16 org_id;
5699 - u16 reserved;
5700 - u16 iop_id:12;
5701 - u16 reserved1:4;
5702 - u16 host_unit_id;
5703 - u16 segment_number:12;
5704 - u16 i2o_version:4;
5705 - u8 iop_state;
5706 - u8 msg_type;
5707 - u16 inbound_frame_size;
5708 - u8 init_code;
5709 - u8 reserved2;
5710 - u32 max_inbound_frames;
5711 - u32 cur_inbound_frames;
5712 - u32 max_outbound_frames;
5713 + __u16 org_id;
5714 + __u16 reserved;
5715 + __u16 iop_id:12;
5716 + __u16 reserved1:4;
5717 + __u16 host_unit_id;
5718 + __u16 segment_number:12;
5719 + __u16 i2o_version:4;
5720 + __u8 iop_state;
5721 + __u8 msg_type;
5722 + __u16 inbound_frame_size;
5723 + __u8 init_code;
5724 + __u8 reserved2;
5725 + __u32 max_inbound_frames;
5726 + __u32 cur_inbound_frames;
5727 + __u32 max_outbound_frames;
5728 char product_id[24];
5729 - u32 expected_lct_size;
5730 - u32 iop_capabilities;
5731 - u32 desired_mem_size;
5732 - u32 current_mem_size;
5733 - u32 current_mem_base;
5734 - u32 desired_io_size;
5735 - u32 current_io_size;
5736 - u32 current_io_base;
5737 - u32 reserved3:24;
5738 - u32 cmd_status:8;
5739 + __u32 expected_lct_size;
5740 + __u32 iop_capabilities;
5741 + __u32 desired_mem_size;
5742 + __u32 current_mem_size;
5743 + __u32 current_mem_base;
5744 + __u32 desired_io_size;
5745 + __u32 current_io_size;
5746 + __u32 current_io_base;
5747 + __u32 reserved3:24;
5748 + __u32 cmd_status:8;
5749 } i2o_status_block;
5751 /* Event indicator mask flags */
5752 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/isdn/capilli.h linux-libc-headers-2.6.8.0/include/linux/isdn/capilli.h
5753 --- linux-libc-headers-2.6.8.0-dist/include/linux/isdn/capilli.h 2004-03-28 07:52:12.000000000 -0600
5754 +++ linux-libc-headers-2.6.8.0/include/linux/isdn/capilli.h 2004-08-26 13:26:47.000000000 -0500
5755 @@ -43,20 +43,20 @@
5756 char *driver_name; /* name of driver */
5757 int (*load_firmware)(struct capi_ctr *, capiloaddata *);
5758 void (*reset_ctr)(struct capi_ctr *);
5759 - void (*register_appl)(struct capi_ctr *, u16 appl,
5760 + void (*register_appl)(struct capi_ctr *, __u16 appl,
5761 capi_register_params *);
5762 - void (*release_appl)(struct capi_ctr *, u16 appl);
5763 - u16 (*send_message)(struct capi_ctr *, struct sk_buff *skb);
5764 + void (*release_appl)(struct capi_ctr *, __u16 appl);
5765 + __u16 (*send_message)(struct capi_ctr *, struct sk_buff *skb);
5767 char *(*procinfo)(struct capi_ctr *);
5768 int (*ctr_read_proc)(char *page, char **start, off_t off,
5769 int count, int *eof, struct capi_ctr *card);
5771 /* filled in before calling ready callback */
5772 - u8 manu[CAPI_MANUFACTURER_LEN]; /* CAPI_GET_MANUFACTURER */
5773 + __u8 manu[CAPI_MANUFACTURER_LEN]; /* CAPI_GET_MANUFACTURER */
5774 capi_version version; /* CAPI_GET_VERSION */
5775 capi_profile profile; /* CAPI_GET_PROFILE */
5776 - u8 serial[CAPI_SERIAL_LEN]; /* CAPI_GET_SERIAL */
5777 + __u8 serial[CAPI_SERIAL_LEN]; /* CAPI_GET_SERIAL */
5779 /* management information for kcapi */
5781 @@ -81,7 +81,7 @@
5782 void capi_ctr_reseted(struct capi_ctr * card);
5783 void capi_ctr_suspend_output(struct capi_ctr * card);
5784 void capi_ctr_resume_output(struct capi_ctr * card);
5785 -void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb);
5786 +void capi_ctr_handle_message(struct capi_ctr * card, __u16 appl, struct sk_buff *skb);
5788 // ---------------------------------------------------------------------------
5789 // needed for AVM capi drivers
5790 @@ -102,11 +102,11 @@
5791 // ---------------------------------------------------------------------------
5792 // library functions for use by hardware controller drivers
5794 -void capilib_new_ncci(struct list_head *head, u16 applid, u32 ncci, u32 winsize);
5795 -void capilib_free_ncci(struct list_head *head, u16 applid, u32 ncci);
5796 -void capilib_release_appl(struct list_head *head, u16 applid);
5797 +void capilib_new_ncci(struct list_head *head, __u16 applid, __u32 ncci, __u32 winsize);
5798 +void capilib_free_ncci(struct list_head *head, __u16 applid, __u32 ncci);
5799 +void capilib_release_appl(struct list_head *head, __u16 applid);
5800 void capilib_release(struct list_head *head);
5801 -void capilib_data_b3_conf(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
5802 -u16 capilib_data_b3_req(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
5803 +void capilib_data_b3_conf(struct list_head *head, __u16 applid, __u32 ncci, __u16 msgid);
5804 +__u16 capilib_data_b3_req(struct list_head *head, __u16 applid, __u32 ncci, __u16 msgid);
5806 #endif /* __CAPILLI_H__ */
5807 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/jhash.h linux-libc-headers-2.6.8.0/include/linux/jhash.h
5808 --- linux-libc-headers-2.6.8.0-dist/include/linux/jhash.h 2004-03-28 07:52:09.000000000 -0600
5809 +++ linux-libc-headers-2.6.8.0/include/linux/jhash.h 2004-08-26 05:42:08.000000000 -0500
5810 @@ -41,19 +41,19 @@
5811 * of bytes. No alignment or length assumptions are made about
5812 * the input key.
5813 */
5814 -static inline u32 jhash(const void *key, u32 length, u32 initval)
5815 +static inline __u32 jhash(const void *key, __u32 length, __u32 initval)
5816 {
5817 - u32 a, b, c, len;
5818 - const u8 *k = key;
5819 + __u32 a, b, c, len;
5820 + const __u8 *k = key;
5822 len = length;
5823 a = b = JHASH_GOLDEN_RATIO;
5824 c = initval;
5826 while (len >= 12) {
5827 - a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
5828 - b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
5829 - c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
5830 + a += (k[0] +((__u32)k[1]<<8) +((__u32)k[2]<<16) +((__u32)k[3]<<24));
5831 + b += (k[4] +((__u32)k[5]<<8) +((__u32)k[6]<<16) +((__u32)k[7]<<24));
5832 + c += (k[8] +((__u32)k[9]<<8) +((__u32)k[10]<<16)+((__u32)k[11]<<24));
5834 __jhash_mix(a,b,c);
5836 @@ -63,16 +63,16 @@
5838 c += length;
5839 switch (len) {
5840 - case 11: c += ((u32)k[10]<<24);
5841 - case 10: c += ((u32)k[9]<<16);
5842 - case 9 : c += ((u32)k[8]<<8);
5843 - case 8 : b += ((u32)k[7]<<24);
5844 - case 7 : b += ((u32)k[6]<<16);
5845 - case 6 : b += ((u32)k[5]<<8);
5846 + case 11: c += ((__u32)k[10]<<24);
5847 + case 10: c += ((__u32)k[9]<<16);
5848 + case 9 : c += ((__u32)k[8]<<8);
5849 + case 8 : b += ((__u32)k[7]<<24);
5850 + case 7 : b += ((__u32)k[6]<<16);
5851 + case 6 : b += ((__u32)k[5]<<8);
5852 case 5 : b += k[4];
5853 - case 4 : a += ((u32)k[3]<<24);
5854 - case 3 : a += ((u32)k[2]<<16);
5855 - case 2 : a += ((u32)k[1]<<8);
5856 + case 4 : a += ((__u32)k[3]<<24);
5857 + case 3 : a += ((__u32)k[2]<<16);
5858 + case 2 : a += ((__u32)k[1]<<8);
5859 case 1 : a += k[0];
5860 };
5862 @@ -81,12 +81,12 @@
5863 return c;
5864 }
5866 -/* A special optimized version that handles 1 or more of u32s.
5867 - * The length parameter here is the number of u32s in the key.
5868 +/* A special optimized version that handles 1 or more of __u32s.
5869 + * The length parameter here is the number of __u32s in the key.
5870 */
5871 -static inline u32 jhash2(u32 *k, u32 length, u32 initval)
5872 +static inline __u32 jhash2(__u32 *k, __u32 length, __u32 initval)
5873 {
5874 - u32 a, b, c, len;
5875 + __u32 a, b, c, len;
5877 a = b = JHASH_GOLDEN_RATIO;
5878 c = initval;
5879 @@ -119,7 +119,7 @@
5880 * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
5881 * done at the end is not done here.
5882 */
5883 -static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
5884 +static inline __u32 jhash_3words(__u32 a, __u32 b, __u32 c, __u32 initval)
5885 {
5886 a += JHASH_GOLDEN_RATIO;
5887 b += JHASH_GOLDEN_RATIO;
5888 @@ -130,12 +130,12 @@
5889 return c;
5890 }
5892 -static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
5893 +static inline __u32 jhash_2words(__u32 a, __u32 b, __u32 initval)
5894 {
5895 return jhash_3words(a, b, 0, initval);
5896 }
5898 -static inline u32 jhash_1word(u32 a, u32 initval)
5899 +static inline __u32 jhash_1word(__u32 a, __u32 initval)
5900 {
5901 return jhash_3words(a, 0, 0, initval);
5902 }
5903 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/jiffies.h linux-libc-headers-2.6.8.0/include/linux/jiffies.h
5904 --- linux-libc-headers-2.6.8.0-dist/include/linux/jiffies.h 2004-01-17 17:04:30.000000000 -0600
5905 +++ linux-libc-headers-2.6.8.0/include/linux/jiffies.h 2004-08-26 13:26:33.000000000 -0500
5906 @@ -12,15 +12,15 @@
5907 * without sampling the sequence number in xtime_lock.
5908 * get_jiffies_64() will do this for you as appropriate.
5909 */
5910 -extern u64 jiffies_64;
5911 +extern __u64 jiffies_64;
5912 extern unsigned long volatile jiffies;
5914 #if (BITS_PER_LONG < 64)
5915 -u64 get_jiffies_64(void);
5916 +__u64 get_jiffies_64(void);
5917 #else
5918 -static inline u64 get_jiffies_64(void)
5919 +static inline __u64 get_jiffies_64(void)
5920 {
5921 - return (u64)jiffies;
5922 + return (__u64)jiffies;
5923 }
5924 #endif
5926 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/kernel_stat.h linux-libc-headers-2.6.8.0/include/linux/kernel_stat.h
5927 --- linux-libc-headers-2.6.8.0-dist/include/linux/kernel_stat.h 2004-04-19 16:13:51.000000000 -0500
5928 +++ linux-libc-headers-2.6.8.0/include/linux/kernel_stat.h 2004-08-26 05:42:08.000000000 -0500
5929 @@ -12,13 +12,13 @@
5930 */
5932 struct cpu_usage_stat {
5933 - u64 user;
5934 - u64 nice;
5935 - u64 system;
5936 - u64 softirq;
5937 - u64 irq;
5938 - u64 idle;
5939 - u64 iowait;
5940 + __u64 user;
5941 + __u64 nice;
5942 + __u64 system;
5943 + __u64 softirq;
5944 + __u64 irq;
5945 + __u64 idle;
5946 + __u64 iowait;
5947 };
5949 struct kernel_stat {
5950 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/libata.h linux-libc-headers-2.6.8.0/include/linux/libata.h
5951 --- linux-libc-headers-2.6.8.0-dist/include/linux/libata.h 2004-08-18 13:16:03.000000000 -0500
5952 +++ linux-libc-headers-2.6.8.0/include/linux/libata.h 2004-08-26 05:42:08.000000000 -0500
5953 @@ -160,7 +160,7 @@
5954 struct ata_queued_cmd;
5956 /* typedefs */
5957 -typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, u8 drv_stat);
5958 +typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, __u8 drv_stat);
5960 struct ata_ioports {
5961 unsigned long cmd_addr;
5962 @@ -246,18 +246,18 @@
5963 };
5965 struct ata_device {
5966 - u64 n_sectors; /* size of device, if ATA */
5967 + __u64 n_sectors; /* size of device, if ATA */
5968 unsigned long flags; /* ATA_DFLAG_xxx */
5969 unsigned int class; /* ATA_DEV_xxx */
5970 unsigned int devno; /* 0 or 1 */
5971 - u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
5972 + __u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
5973 unsigned int pio_mode;
5974 unsigned int udma_mode;
5976 /* cache info about current transfer mode */
5977 - u8 xfer_protocol; /* taskfile xfer protocol */
5978 - u8 read_cmd; /* opcode to use on read */
5979 - u8 write_cmd; /* opcode to use on write */
5980 + __u8 xfer_protocol; /* taskfile xfer protocol */
5981 + __u8 read_cmd; /* opcode to use on read */
5982 + __u8 write_cmd; /* opcode to use on write */
5983 };
5985 struct ata_port {
5986 @@ -272,8 +272,8 @@
5988 struct ata_ioports ioaddr; /* ATA cmd/ctl/dma register blocks */
5990 - u8 ctl; /* cache of ATA control register */
5991 - u8 last_ctl; /* Cache last written value */
5992 + __u8 ctl; /* cache of ATA control register */
5993 + __u8 last_ctl; /* Cache last written value */
5994 unsigned int bus_state;
5995 unsigned int port_state;
5996 unsigned int pio_mask;
5997 @@ -312,7 +312,7 @@
5998 void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
6000 void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);
6001 - u8 (*check_status)(struct ata_port *ap);
6002 + __u8 (*check_status)(struct ata_port *ap);
6004 void (*phy_reset) (struct ata_port *ap);
6005 void (*post_set_mode) (struct ata_port *ap);
6006 @@ -328,9 +328,9 @@
6007 irqreturn_t (*irq_handler)(int, void *, struct pt_regs *);
6008 void (*irq_clear) (struct ata_port *);
6010 - u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
6011 + __u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
6012 void (*scr_write) (struct ata_port *ap, unsigned int sc_reg,
6013 - u32 val);
6014 + __u32 val);
6016 int (*port_start) (struct ata_port *ap);
6017 void (*port_stop) (struct ata_port *ap);
6018 @@ -374,10 +374,10 @@
6019 extern void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf);
6020 extern void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf);
6021 extern void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf);
6022 -extern void ata_tf_to_fis(struct ata_taskfile *tf, u8 *fis, u8 pmp);
6023 -extern void ata_tf_from_fis(u8 *fis, struct ata_taskfile *tf);
6024 -extern u8 ata_check_status_pio(struct ata_port *ap);
6025 -extern u8 ata_check_status_mmio(struct ata_port *ap);
6026 +extern void ata_tf_to_fis(struct ata_taskfile *tf, __u8 *fis, __u8 pmp);
6027 +extern void ata_tf_from_fis(__u8 *fis, struct ata_taskfile *tf);
6028 +extern __u8 ata_check_status_pio(struct ata_port *ap);
6029 +extern __u8 ata_check_status_mmio(struct ata_port *ap);
6030 extern void ata_exec_command_pio(struct ata_port *ap, struct ata_taskfile *tf);
6031 extern void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf);
6032 extern int ata_port_start (struct ata_port *ap);
6033 @@ -397,7 +397,7 @@
6034 extern void ata_bmdma_start_pio (struct ata_queued_cmd *qc);
6035 extern void ata_bmdma_irq_clear(struct ata_port *ap);
6036 extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits);
6037 -extern void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat);
6038 +extern void ata_qc_complete(struct ata_queued_cmd *qc, __u8 drv_stat);
6039 extern void ata_eng_timeout(struct ata_port *ap);
6040 extern int ata_std_bios_param(struct scsi_device *sdev,
6041 struct block_device *bdev,
6042 @@ -416,7 +416,7 @@
6043 (dev->class == ATA_DEV_ATAPI));
6044 }
6046 -static inline u8 ata_chk_err(struct ata_port *ap)
6047 +static inline __u8 ata_chk_err(struct ata_port *ap)
6048 {
6049 if (ap->flags & ATA_FLAG_MMIO) {
6050 return readb((void *) ap->ioaddr.error_addr);
6051 @@ -424,12 +424,12 @@
6052 return inb(ap->ioaddr.error_addr);
6053 }
6055 -static inline u8 ata_chk_status(struct ata_port *ap)
6056 +static inline __u8 ata_chk_status(struct ata_port *ap)
6057 {
6058 return ap->ops->check_status(ap);
6059 }
6061 -static inline u8 ata_altstatus(struct ata_port *ap)
6062 +static inline __u8 ata_altstatus(struct ata_port *ap)
6063 {
6064 if (ap->flags & ATA_FLAG_MMIO)
6065 return readb(ap->ioaddr.altstatus_addr);
6066 @@ -442,10 +442,10 @@
6067 ndelay(400);
6068 }
6070 -static inline u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
6071 +static inline __u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
6072 unsigned int max)
6073 {
6074 - u8 status;
6075 + __u8 status;
6077 do {
6078 udelay(10);
6079 @@ -456,9 +456,9 @@
6080 return status;
6081 }
6083 -static inline u8 ata_wait_idle(struct ata_port *ap)
6084 +static inline __u8 ata_wait_idle(struct ata_port *ap)
6085 {
6086 - u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
6087 + __u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
6089 if (status & (ATA_BUSY | ATA_DRQ)) {
6090 unsigned long l = ap->ioaddr.status_addr;
6091 @@ -495,10 +495,10 @@
6092 tf->device = ATA_DEVICE_OBS | ATA_DEV1;
6093 }
6095 -static inline u8 ata_irq_on(struct ata_port *ap)
6096 +static inline __u8 ata_irq_on(struct ata_port *ap)
6097 {
6098 struct ata_ioports *ioaddr = &ap->ioaddr;
6099 - u8 tmp;
6100 + __u8 tmp;
6102 ap->ctl &= ~ATA_NIEN;
6103 ap->last_ctl = ap->ctl;
6104 @@ -514,10 +514,10 @@
6105 return tmp;
6106 }
6108 -static inline u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
6109 +static inline __u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
6110 {
6111 unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
6112 - u8 host_stat, post_stat, status;
6113 + __u8 host_stat, post_stat, status;
6115 status = ata_busy_wait(ap, bits, 1000);
6116 if (status & bits)
6117 @@ -545,12 +545,12 @@
6118 return status;
6119 }
6121 -static inline u32 scr_read(struct ata_port *ap, unsigned int reg)
6122 +static inline __u32 scr_read(struct ata_port *ap, unsigned int reg)
6123 {
6124 return ap->ops->scr_read(ap, reg);
6125 }
6127 -static inline void scr_write(struct ata_port *ap, unsigned int reg, u32 val)
6128 +static inline void scr_write(struct ata_port *ap, unsigned int reg, __u32 val)
6129 {
6130 ap->ops->scr_write(ap, reg, val);
6131 }
6132 @@ -589,9 +589,9 @@
6133 }
6134 }
6136 -static inline u8 ata_bmdma_status(struct ata_port *ap)
6137 +static inline __u8 ata_bmdma_status(struct ata_port *ap)
6138 {
6139 - u8 host_stat;
6140 + __u8 host_stat;
6141 if (ap->flags & ATA_FLAG_MMIO) {
6142 void *mmio = (void *) ap->ioaddr.bmdma_addr;
6143 host_stat = readb(mmio + ATA_DMA_STATUS);
6144 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/bind.h linux-libc-headers-2.6.8.0/include/linux/lockd/bind.h
6145 --- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/bind.h 2003-12-15 12:46:58.000000000 -0600
6146 +++ linux-libc-headers-2.6.8.0/include/linux/lockd/bind.h 2004-08-26 05:42:08.000000000 -0500
6147 @@ -18,7 +18,7 @@
6148 * This is the set of functions for lockd->nfsd communication
6149 */
6150 struct nlmsvc_binding {
6151 - u32 (*fopen)(struct svc_rqst *,
6152 + __u32 (*fopen)(struct svc_rqst *,
6153 struct nfs_fh *,
6154 struct file *);
6155 void (*fclose)(struct file *);
6156 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/nlm.h linux-libc-headers-2.6.8.0/include/linux/lockd/nlm.h
6157 --- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/nlm.h 2004-01-17 17:04:34.000000000 -0600
6158 +++ linux-libc-headers-2.6.8.0/include/linux/lockd/nlm.h 2004-08-26 05:42:08.000000000 -0500
6159 @@ -11,8 +11,8 @@
6162 /* Maximum file offset in file_lock.fl_end */
6163 -# define NLM_OFFSET_MAX ((s32) 0x7fffffff)
6164 -# define NLM4_OFFSET_MAX ((s64) ((~(u64)0) >> 1))
6165 +# define NLM_OFFSET_MAX ((__s32) 0x7fffffff)
6166 +# define NLM4_OFFSET_MAX ((__s64) ((~(__u64)0) >> 1))
6168 /* Return states for NLM */
6169 enum {
6170 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/share.h linux-libc-headers-2.6.8.0/include/linux/lockd/share.h
6171 --- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/share.h 2003-12-15 12:46:58.000000000 -0600
6172 +++ linux-libc-headers-2.6.8.0/include/linux/lockd/share.h 2004-08-26 13:26:43.000000000 -0500
6173 @@ -17,13 +17,13 @@
6174 struct nlm_host * s_host; /* client host */
6175 struct nlm_file * s_file; /* shared file */
6176 struct xdr_netobj s_owner; /* owner handle */
6177 - u32 s_access; /* access mode */
6178 - u32 s_mode; /* deny mode */
6179 + __u32 s_access; /* access mode */
6180 + __u32 s_mode; /* deny mode */
6181 };
6183 -u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
6184 +__u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
6185 struct nlm_args *);
6186 -u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
6187 +__u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
6188 struct nlm_args *);
6189 int nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, int);
6191 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/sm_inter.h linux-libc-headers-2.6.8.0/include/linux/lockd/sm_inter.h
6192 --- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/sm_inter.h 2003-12-15 12:46:58.000000000 -0600
6193 +++ linux-libc-headers-2.6.8.0/include/linux/lockd/sm_inter.h 2004-08-26 05:42:08.000000000 -0500
6194 @@ -24,23 +24,23 @@
6195 * Arguments for all calls to statd
6196 */
6197 struct nsm_args {
6198 - u32 addr; /* remote address */
6199 - u32 prog; /* RPC callback info */
6200 - u32 vers;
6201 - u32 proc;
6202 - u32 proto; /* protocol (udp/tcp) plus server/client flag */
6203 + __u32 addr; /* remote address */
6204 + __u32 prog; /* RPC callback info */
6205 + __u32 vers;
6206 + __u32 proc;
6207 + __u32 proto; /* protocol (udp/tcp) plus server/client flag */
6208 };
6210 /*
6211 * Result returned by statd
6212 */
6213 struct nsm_res {
6214 - u32 status;
6215 - u32 state;
6216 + __u32 status;
6217 + __u32 state;
6218 };
6220 int nsm_monitor(struct nlm_host *);
6221 int nsm_unmonitor(struct nlm_host *);
6222 -extern u32 nsm_local_state;
6223 +extern __u32 nsm_local_state;
6225 #endif /* LINUX_LOCKD_SM_INTER_H */
6226 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr.h linux-libc-headers-2.6.8.0/include/linux/lockd/xdr.h
6227 --- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr.h 2004-01-05 12:42:33.000000000 -0600
6228 +++ linux-libc-headers-2.6.8.0/include/linux/lockd/xdr.h 2004-08-26 05:42:08.000000000 -0500
6229 @@ -48,12 +48,12 @@
6230 struct nlm_args {
6231 struct nlm_cookie cookie;
6232 struct nlm_lock lock;
6233 - u32 block;
6234 - u32 reclaim;
6235 - u32 state;
6236 - u32 monitor;
6237 - u32 fsm_access;
6238 - u32 fsm_mode;
6239 + __u32 block;
6240 + __u32 reclaim;
6241 + __u32 state;
6242 + __u32 monitor;
6243 + __u32 fsm_access;
6244 + __u32 fsm_mode;
6245 };
6247 typedef struct nlm_args nlm_args;
6248 @@ -63,7 +63,7 @@
6249 */
6250 struct nlm_res {
6251 struct nlm_cookie cookie;
6252 - u32 status;
6253 + __u32 status;
6254 struct nlm_lock lock;
6255 };
6257 @@ -73,10 +73,10 @@
6258 struct nlm_reboot {
6259 char * mon;
6260 int len;
6261 - u32 state;
6262 - u32 addr;
6263 - u32 vers;
6264 - u32 proto;
6265 + __u32 state;
6266 + __u32 addr;
6267 + __u32 vers;
6268 + __u32 proto;
6269 };
6271 /*
6272 @@ -84,24 +84,24 @@
6273 */
6274 #define NLMSVC_XDRSIZE sizeof(struct nlm_args)
6276 -int nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
6277 -int nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
6278 -int nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
6279 -int nlmsvc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
6280 -int nlmsvc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
6281 -int nlmsvc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
6282 -int nlmsvc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
6283 -int nlmsvc_encode_void(struct svc_rqst *, u32 *, void *);
6284 -int nlmsvc_decode_void(struct svc_rqst *, u32 *, void *);
6285 -int nlmsvc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
6286 -int nlmsvc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
6287 -int nlmsvc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
6288 -int nlmsvc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
6289 +int nlmsvc_decode_testargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6290 +int nlmsvc_encode_testres(struct svc_rqst *, __u32 *, struct nlm_res *);
6291 +int nlmsvc_decode_lockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6292 +int nlmsvc_decode_cancargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6293 +int nlmsvc_decode_unlockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6294 +int nlmsvc_encode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
6295 +int nlmsvc_decode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
6296 +int nlmsvc_encode_void(struct svc_rqst *, __u32 *, void *);
6297 +int nlmsvc_decode_void(struct svc_rqst *, __u32 *, void *);
6298 +int nlmsvc_decode_shareargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6299 +int nlmsvc_encode_shareres(struct svc_rqst *, __u32 *, struct nlm_res *);
6300 +int nlmsvc_decode_notify(struct svc_rqst *, __u32 *, struct nlm_args *);
6301 +int nlmsvc_decode_reboot(struct svc_rqst *, __u32 *, struct nlm_reboot *);
6302 /*
6303 -int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6304 -int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6305 -int nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6306 -int nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6307 +int nlmclt_encode_testargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6308 +int nlmclt_encode_lockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6309 +int nlmclt_encode_cancargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6310 +int nlmclt_encode_unlockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6311 */
6313 #endif /* LOCKD_XDR_H */
6314 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr4.h linux-libc-headers-2.6.8.0/include/linux/lockd/xdr4.h
6315 --- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr4.h 2004-01-05 12:42:33.000000000 -0600
6316 +++ linux-libc-headers-2.6.8.0/include/linux/lockd/xdr4.h 2004-08-26 05:42:08.000000000 -0500
6317 @@ -22,24 +22,24 @@
6321 -int nlm4svc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
6322 -int nlm4svc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
6323 -int nlm4svc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
6324 -int nlm4svc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
6325 -int nlm4svc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
6326 -int nlm4svc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
6327 -int nlm4svc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
6328 -int nlm4svc_encode_void(struct svc_rqst *, u32 *, void *);
6329 -int nlm4svc_decode_void(struct svc_rqst *, u32 *, void *);
6330 -int nlm4svc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
6331 -int nlm4svc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
6332 -int nlm4svc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
6333 -int nlm4svc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
6334 +int nlm4svc_decode_testargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6335 +int nlm4svc_encode_testres(struct svc_rqst *, __u32 *, struct nlm_res *);
6336 +int nlm4svc_decode_lockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6337 +int nlm4svc_decode_cancargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6338 +int nlm4svc_decode_unlockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6339 +int nlm4svc_encode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
6340 +int nlm4svc_decode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
6341 +int nlm4svc_encode_void(struct svc_rqst *, __u32 *, void *);
6342 +int nlm4svc_decode_void(struct svc_rqst *, __u32 *, void *);
6343 +int nlm4svc_decode_shareargs(struct svc_rqst *, __u32 *, struct nlm_args *);
6344 +int nlm4svc_encode_shareres(struct svc_rqst *, __u32 *, struct nlm_res *);
6345 +int nlm4svc_decode_notify(struct svc_rqst *, __u32 *, struct nlm_args *);
6346 +int nlm4svc_decode_reboot(struct svc_rqst *, __u32 *, struct nlm_reboot *);
6347 /*
6348 -int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6349 -int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6350 -int nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6351 -int nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
6352 +int nlmclt_encode_testargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6353 +int nlmclt_encode_lockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6354 +int nlmclt_encode_cancargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6355 +int nlmclt_encode_unlockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
6356 */
6358 #endif /* LOCKD_XDR4_H */
6359 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mca.h linux-libc-headers-2.6.8.0/include/linux/mca.h
6360 --- linux-libc-headers-2.6.8.0-dist/include/linux/mca.h 2004-08-18 13:16:03.000000000 -0500
6361 +++ linux-libc-headers-2.6.8.0/include/linux/mca.h 2004-08-26 05:42:08.000000000 -0500
6362 @@ -50,7 +50,7 @@
6363 };
6365 struct mca_device {
6366 - u64 dma_mask;
6367 + __u64 dma_mask;
6368 int pos_id;
6369 int slot;
6371 @@ -91,7 +91,7 @@
6372 };
6374 struct mca_bus {
6375 - u64 default_dma_mask;
6376 + __u64 default_dma_mask;
6377 int number;
6378 struct mca_bus_accessor_functions f;
6379 struct device dev;
6380 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mii.h linux-libc-headers-2.6.8.0/include/linux/mii.h
6381 --- linux-libc-headers-2.6.8.0-dist/include/linux/mii.h 2004-06-23 16:52:55.000000000 -0500
6382 +++ linux-libc-headers-2.6.8.0/include/linux/mii.h 2004-08-26 05:42:08.000000000 -0500
6383 @@ -138,10 +138,10 @@
6385 /* This structure is used in all SIOCxMIIxxx ioctl calls */
6386 struct mii_ioctl_data {
6387 - u16 phy_id;
6388 - u16 reg_num;
6389 - u16 val_in;
6390 - u16 val_out;
6391 + __u16 phy_id;
6392 + __u16 reg_num;
6393 + __u16 val_in;
6394 + __u16 val_out;
6395 };
6398 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mtd/map.h linux-libc-headers-2.6.8.0/include/linux/mtd/map.h
6399 --- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/map.h 2004-08-18 13:16:06.000000000 -0500
6400 +++ linux-libc-headers-2.6.8.0/include/linux/mtd/map.h 2004-08-26 05:42:08.000000000 -0500
6401 @@ -36,20 +36,20 @@
6402 int buswidth; /* in octets */
6404 #ifdef CONFIG_MTD_COMPLEX_MAPPINGS
6405 - u8 (*read8)(struct map_info *, unsigned long);
6406 - u16 (*read16)(struct map_info *, unsigned long);
6407 - u32 (*read32)(struct map_info *, unsigned long);
6408 - u64 (*read64)(struct map_info *, unsigned long);
6409 + __u8 (*read8)(struct map_info *, unsigned long);
6410 + __u16 (*read16)(struct map_info *, unsigned long);
6411 + __u32 (*read32)(struct map_info *, unsigned long);
6412 + __u64 (*read64)(struct map_info *, unsigned long);
6413 /* If it returned a 'long' I'd call it readl.
6414 * It doesn't.
6415 * I won't.
6416 * dwmw2 */
6418 void (*copy_from)(struct map_info *, void *, unsigned long, ssize_t);
6419 - void (*write8)(struct map_info *, u8, unsigned long);
6420 - void (*write16)(struct map_info *, u16, unsigned long);
6421 - void (*write32)(struct map_info *, u32, unsigned long);
6422 - void (*write64)(struct map_info *, u64, unsigned long);
6423 + void (*write8)(struct map_info *, __u8, unsigned long);
6424 + void (*write16)(struct map_info *, __u16, unsigned long);
6425 + void (*write32)(struct map_info *, __u32, unsigned long);
6426 + void (*write64)(struct map_info *, __u64, unsigned long);
6427 void (*copy_to)(struct map_info *, unsigned long, const void *, ssize_t);
6429 /* We can perhaps put in 'point' and 'unpoint' methods, if we really
6430 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mtd/nand.h linux-libc-headers-2.6.8.0/include/linux/mtd/nand.h
6431 --- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/nand.h 2004-08-18 13:16:06.000000000 -0500
6432 +++ linux-libc-headers-2.6.8.0/include/linux/mtd/nand.h 2004-08-26 05:42:08.000000000 -0500
6433 @@ -271,8 +271,8 @@
6435 u_char (*read_byte)(struct mtd_info *mtd);
6436 void (*write_byte)(struct mtd_info *mtd, u_char byte);
6437 - u16 (*read_word)(struct mtd_info *mtd);
6438 - void (*write_word)(struct mtd_info *mtd, u16 word);
6439 + __u16 (*read_word)(struct mtd_info *mtd);
6440 + void (*write_word)(struct mtd_info *mtd, __u16 word);
6442 void (*write_buf)(struct mtd_info *mtd, const u_char *buf, int len);
6443 void (*read_buf)(struct mtd_info *mtd, u_char *buf, int len);
6444 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mtd/pmc551.h linux-libc-headers-2.6.8.0/include/linux/mtd/pmc551.h
6445 --- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/pmc551.h 2004-03-28 07:52:13.000000000 -0600
6446 +++ linux-libc-headers-2.6.8.0/include/linux/mtd/pmc551.h 2004-08-26 05:42:08.000000000 -0500
6447 @@ -25,9 +25,9 @@
6448 struct mypriv {
6449 struct pci_dev *dev;
6450 u_char *start;
6451 - u32 base_map0;
6452 - u32 curr_map0;
6453 - u32 asize;
6454 + __u32 base_map0;
6455 + __u32 curr_map0;
6456 + __u32 asize;
6457 struct mtd_info *nextpmc551;
6458 };
6460 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nbd.h linux-libc-headers-2.6.8.0/include/linux/nbd.h
6461 --- linux-libc-headers-2.6.8.0-dist/include/linux/nbd.h 2004-03-28 07:52:09.000000000 -0600
6462 +++ linux-libc-headers-2.6.8.0/include/linux/nbd.h 2004-08-26 05:42:08.000000000 -0500
6463 @@ -45,11 +45,11 @@
6464 * server. All data are in network byte order.
6465 */
6466 struct nbd_request {
6467 - u32 magic;
6468 - u32 type; /* == READ || == WRITE */
6469 + __u32 magic;
6470 + __u32 type; /* == READ || == WRITE */
6471 char handle[8];
6472 - u64 from;
6473 - u32 len;
6474 + __u64 from;
6475 + __u32 len;
6476 }
6477 #ifdef __GNUC__
6478 __attribute__ ((packed))
6479 @@ -61,8 +61,8 @@
6480 * it has completed an I/O request (or an error occurs).
6481 */
6482 struct nbd_reply {
6483 - u32 magic;
6484 - u32 error; /* 0 = ok, else error */
6485 + __u32 magic;
6486 + __u32 error; /* 0 = ok, else error */
6487 char handle[8]; /* handle you got from request */
6488 };
6489 #endif
6490 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_i.h linux-libc-headers-2.6.8.0/include/linux/nfs_fs_i.h
6491 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_i.h 2004-01-17 17:04:31.000000000 -0600
6492 +++ linux-libc-headers-2.6.8.0/include/linux/nfs_fs_i.h 2004-08-26 05:42:08.000000000 -0500
6493 @@ -8,8 +8,8 @@
6494 * NFS lock info
6495 */
6496 struct nfs_lock_info {
6497 - u32 state;
6498 - u32 flags;
6499 + __u32 state;
6500 + __u32 flags;
6501 struct nlm_host *host;
6502 };
6504 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_sb.h linux-libc-headers-2.6.8.0/include/linux/nfs_fs_sb.h
6505 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_sb.h 2004-06-09 07:00:50.000000000 -0500
6506 +++ linux-libc-headers-2.6.8.0/include/linux/nfs_fs_sb.h 2004-08-26 05:42:08.000000000 -0500
6507 @@ -37,10 +37,10 @@
6508 struct list_head nfs4_siblings; /* List of other nfs_server structs
6509 * that share the same clientid
6510 */
6511 - u32 attr_bitmask[2];/* V4 bitmask representing the set
6512 + __u32 attr_bitmask[2];/* V4 bitmask representing the set
6513 of attributes supported on this
6514 filesystem */
6515 - u32 acl_bitmask; /* V4 bitmask representing the ACEs
6516 + __u32 acl_bitmask; /* V4 bitmask representing the ACEs
6517 that are supported on this
6518 filesystem */
6519 #endif
6520 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfs_xdr.h linux-libc-headers-2.6.8.0/include/linux/nfs_xdr.h
6521 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_xdr.h 2004-06-09 07:00:50.000000000 -0500
6522 +++ linux-libc-headers-2.6.8.0/include/linux/nfs_xdr.h 2004-08-26 05:42:08.000000000 -0500
6523 @@ -90,9 +90,9 @@
6524 };
6526 struct nfs4_change_info {
6527 - u32 atomic;
6528 - u64 before;
6529 - u64 after;
6530 + __u32 atomic;
6531 + __u64 before;
6532 + __u64 after;
6533 };
6535 /*
6536 @@ -112,7 +112,7 @@
6537 } u;
6538 const struct qstr * name;
6539 const struct nfs_server *server; /* Needed for ID mapping */
6540 - const u32 * bitmask;
6541 + const __u32 * bitmask;
6542 };
6544 struct nfs_openres {
6545 @@ -168,7 +168,7 @@
6546 * */
6547 struct nfs_lowner {
6548 __u64 clientid;
6549 - u32 id;
6550 + __u32 id;
6551 };
6553 struct nfs_open_to_lock {
6554 @@ -328,7 +328,7 @@
6555 nfs4_stateid stateid;
6556 struct iattr * iap;
6557 const struct nfs_server * server; /* Needed for name mapping */
6558 - const u32 * bitmask;
6559 + const __u32 * bitmask;
6560 };
6562 struct nfs_setattrres {
6563 @@ -482,32 +482,32 @@
6565 #ifdef CONFIG_NFS_V4
6567 -typedef u64 clientid4;
6568 +typedef __u64 clientid4;
6570 struct nfs4_accessargs {
6571 const struct nfs_fh * fh;
6572 - u32 access;
6573 + __u32 access;
6574 };
6576 struct nfs4_accessres {
6577 - u32 supported;
6578 - u32 access;
6579 + __u32 supported;
6580 + __u32 access;
6581 };
6583 struct nfs4_create_arg {
6584 - u32 ftype;
6585 + __u32 ftype;
6586 union {
6587 struct qstr * symlink; /* NF4LNK */
6588 struct {
6589 - u32 specdata1;
6590 - u32 specdata2;
6591 + __u32 specdata1;
6592 + __u32 specdata2;
6593 } device; /* NF4BLK, NF4CHR */
6594 } u;
6595 const struct qstr * name;
6596 const struct nfs_server * server;
6597 const struct iattr * attrs;
6598 const struct nfs_fh * dir_fh;
6599 - const u32 * bitmask;
6600 + const __u32 * bitmask;
6601 };
6603 struct nfs4_create_res {
6604 @@ -519,12 +519,12 @@
6606 struct nfs4_fsinfo_arg {
6607 const struct nfs_fh * fh;
6608 - const u32 * bitmask;
6609 + const __u32 * bitmask;
6610 };
6612 struct nfs4_getattr_arg {
6613 const struct nfs_fh * fh;
6614 - const u32 * bitmask;
6615 + const __u32 * bitmask;
6616 };
6618 struct nfs4_getattr_res {
6619 @@ -541,7 +541,7 @@
6620 struct nfs4_lookup_arg {
6621 const struct nfs_fh * dir_fh;
6622 const struct qstr * name;
6623 - const u32 * bitmask;
6624 + const __u32 * bitmask;
6625 };
6627 struct nfs4_lookup_res {
6628 @@ -551,19 +551,19 @@
6629 };
6631 struct nfs4_lookup_root_arg {
6632 - const u32 * bitmask;
6633 + const __u32 * bitmask;
6634 };
6636 struct nfs4_pathconf_arg {
6637 const struct nfs_fh * fh;
6638 - const u32 * bitmask;
6639 + const __u32 * bitmask;
6640 };
6642 struct nfs4_readdir_arg {
6643 const struct nfs_fh * fh;
6644 - u64 cookie;
6645 + __u64 cookie;
6646 nfs4_verifier verifier;
6647 - u32 count;
6648 + __u32 count;
6649 struct page ** pages; /* zero-copy data */
6650 unsigned int pgbase; /* zero-copy data */
6651 };
6652 @@ -575,7 +575,7 @@
6654 struct nfs4_readlink {
6655 const struct nfs_fh * fh;
6656 - u32 count; /* zero-copy data */
6657 + __u32 count; /* zero-copy data */
6658 struct page ** pages; /* zero-copy data */
6659 };
6661 @@ -599,23 +599,23 @@
6662 struct nfs4_setclientid {
6663 nfs4_verifier sc_verifier; /* request */
6664 char * sc_name; /* request */
6665 - u32 sc_prog; /* request */
6666 + __u32 sc_prog; /* request */
6667 char sc_netid[4]; /* request */
6668 char sc_uaddr[24]; /* request */
6669 - u32 sc_cb_ident; /* request */
6670 + __u32 sc_cb_ident; /* request */
6671 struct nfs4_client * sc_state; /* response */
6672 };
6674 struct nfs4_statfs_arg {
6675 const struct nfs_fh * fh;
6676 - const u32 * bitmask;
6677 + const __u32 * bitmask;
6678 };
6680 struct nfs4_server_caps_res {
6681 - u32 attr_bitmask[2];
6682 - u32 acl_bitmask;
6683 - u32 has_links;
6684 - u32 has_symlinks;
6685 + __u32 attr_bitmask[2];
6686 + __u32 acl_bitmask;
6687 + __u32 has_links;
6688 + __u32 has_symlinks;
6689 };
6691 #endif /* CONFIG_NFS_V4 */
6692 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/state.h linux-libc-headers-2.6.8.0/include/linux/nfsd/state.h
6693 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/state.h 2004-08-18 13:16:07.000000000 -0500
6694 +++ linux-libc-headers-2.6.8.0/include/linux/nfsd/state.h 2004-08-26 05:42:08.000000000 -0500
6695 @@ -41,18 +41,18 @@
6697 #define NFS4_OPAQUE_LIMIT 1024
6698 typedef struct {
6699 - u32 cl_boot;
6700 - u32 cl_id;
6701 + __u32 cl_boot;
6702 + __u32 cl_id;
6703 } clientid_t;
6705 typedef struct {
6706 - u32 so_boot;
6707 - u32 so_stateownerid;
6708 - u32 so_fileid;
6709 + __u32 so_boot;
6710 + __u32 so_stateownerid;
6711 + __u32 so_fileid;
6712 } stateid_opaque_t;
6714 typedef struct {
6715 - u32 si_generation;
6716 + __u32 si_generation;
6717 stateid_opaque_t si_opaque;
6718 } stateid_t;
6719 #define si_boot si_opaque.so_boot
6720 @@ -68,14 +68,14 @@
6721 /* client delegation callback info */
6722 struct nfs4_callback {
6723 /* SETCLIENTID info */
6724 - u32 cb_parsed; /* addr parsed */
6725 - u32 cb_addr;
6726 + __u32 cb_parsed; /* addr parsed */
6727 + __u32 cb_addr;
6728 unsigned short cb_port;
6729 - u32 cb_prog;
6730 - u32 cb_ident;
6731 + __u32 cb_prog;
6732 + __u32 cb_ident;
6733 struct xdr_netobj cb_netid;
6734 /* RPC client info */
6735 - u32 cb_set; /* successful CB_NULL call */
6736 + __u32 cb_set; /* successful CB_NULL call */
6737 struct rpc_program cb_program;
6738 struct rpc_stat cb_stat;
6739 struct rpc_clnt * cb_client;
6740 @@ -99,7 +99,7 @@
6741 struct xdr_netobj cl_name; /* id generated by client */
6742 nfs4_verifier cl_verifier; /* generated by client */
6743 time_t cl_time; /* time of last lease renewal */
6744 - u32 cl_addr; /* client ipaddress */
6745 + __u32 cl_addr; /* client ipaddress */
6746 struct svc_cred cl_cred; /* setclientid principal */
6747 clientid_t cl_clientid; /* generated by server */
6748 nfs4_verifier cl_confirm; /* generated by server */
6749 @@ -116,7 +116,7 @@
6750 struct list_head cr_strhash; /* hash by cr_name */
6751 struct xdr_netobj cr_name; /* id generated by client */
6752 time_t cr_first_state; /* first state aquisition */
6753 - u32 cr_expired; /* boolean: lease expired? */
6754 + __u32 cr_expired; /* boolean: lease expired? */
6755 };
6757 static inline void
6758 @@ -139,7 +139,7 @@
6759 * is cached.
6760 */
6761 struct nfs4_replay {
6762 - u32 rp_status;
6763 + __u32 rp_status;
6764 unsigned int rp_buflen;
6765 char *rp_buf;
6766 unsigned intrp_allocated;
6767 @@ -175,9 +175,9 @@
6768 struct list_head so_close_lru; /* tail queue */
6769 time_t so_time; /* time of placement on so_close_lru */
6770 int so_is_open_owner; /* 1=openowner,0=lockowner */
6771 - u32 so_id;
6772 + __u32 so_id;
6773 struct nfs4_client * so_client;
6774 - u32 so_seqid;
6775 + __u32 so_seqid;
6776 struct xdr_netobj so_owner; /* open owner name */
6777 int so_confirmed; /* successful OPEN_CONFIRM? */
6778 struct nfs4_replay so_replay;
6779 @@ -192,7 +192,7 @@
6780 struct list_head fi_hash; /* hash by "struct inode *" */
6781 struct list_head fi_perfile; /* list: nfs4_stateid */
6782 struct inode *fi_inode;
6783 - u32 fi_id; /* used with stateowner->so_id
6784 + __u32 fi_id; /* used with stateowner->so_id
6785 * for stateid_hashtbl hash */
6786 };
6788 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr.h linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr.h
6789 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr.h 2004-08-18 13:16:07.000000000 -0500
6790 +++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr.h 2004-08-26 05:42:08.000000000 -0500
6791 @@ -83,7 +83,7 @@
6792 struct svc_fh fh;
6793 __u32 cookie;
6794 __u32 count;
6795 - u32 * buffer;
6796 + __u32 * buffer;
6797 };
6799 struct nfsd_attrstat {
6800 @@ -107,9 +107,9 @@
6801 int count;
6803 struct readdir_cd common;
6804 - u32 * buffer;
6805 + __u32 * buffer;
6806 int buflen;
6807 - u32 * offset;
6808 + __u32 * offset;
6809 };
6811 struct nfsd_statfsres {
6812 @@ -134,39 +134,39 @@
6813 #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore)
6816 -int nfssvc_decode_void(struct svc_rqst *, u32 *, void *);
6817 -int nfssvc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
6818 -int nfssvc_decode_sattrargs(struct svc_rqst *, u32 *,
6819 +int nfssvc_decode_void(struct svc_rqst *, __u32 *, void *);
6820 +int nfssvc_decode_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
6821 +int nfssvc_decode_sattrargs(struct svc_rqst *, __u32 *,
6822 struct nfsd_sattrargs *);
6823 -int nfssvc_decode_diropargs(struct svc_rqst *, u32 *,
6824 +int nfssvc_decode_diropargs(struct svc_rqst *, __u32 *,
6825 struct nfsd_diropargs *);
6826 -int nfssvc_decode_readargs(struct svc_rqst *, u32 *,
6827 +int nfssvc_decode_readargs(struct svc_rqst *, __u32 *,
6828 struct nfsd_readargs *);
6829 -int nfssvc_decode_writeargs(struct svc_rqst *, u32 *,
6830 +int nfssvc_decode_writeargs(struct svc_rqst *, __u32 *,
6831 struct nfsd_writeargs *);
6832 -int nfssvc_decode_createargs(struct svc_rqst *, u32 *,
6833 +int nfssvc_decode_createargs(struct svc_rqst *, __u32 *,
6834 struct nfsd_createargs *);
6835 -int nfssvc_decode_renameargs(struct svc_rqst *, u32 *,
6836 +int nfssvc_decode_renameargs(struct svc_rqst *, __u32 *,
6837 struct nfsd_renameargs *);
6838 -int nfssvc_decode_readlinkargs(struct svc_rqst *, u32 *,
6839 +int nfssvc_decode_readlinkargs(struct svc_rqst *, __u32 *,
6840 struct nfsd_readlinkargs *);
6841 -int nfssvc_decode_linkargs(struct svc_rqst *, u32 *,
6842 +int nfssvc_decode_linkargs(struct svc_rqst *, __u32 *,
6843 struct nfsd_linkargs *);
6844 -int nfssvc_decode_symlinkargs(struct svc_rqst *, u32 *,
6845 +int nfssvc_decode_symlinkargs(struct svc_rqst *, __u32 *,
6846 struct nfsd_symlinkargs *);
6847 -int nfssvc_decode_readdirargs(struct svc_rqst *, u32 *,
6848 +int nfssvc_decode_readdirargs(struct svc_rqst *, __u32 *,
6849 struct nfsd_readdirargs *);
6850 -int nfssvc_encode_void(struct svc_rqst *, u32 *, void *);
6851 -int nfssvc_encode_attrstat(struct svc_rqst *, u32 *, struct nfsd_attrstat *);
6852 -int nfssvc_encode_diropres(struct svc_rqst *, u32 *, struct nfsd_diropres *);
6853 -int nfssvc_encode_readlinkres(struct svc_rqst *, u32 *, struct nfsd_readlinkres *);
6854 -int nfssvc_encode_readres(struct svc_rqst *, u32 *, struct nfsd_readres *);
6855 -int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *);
6856 -int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *);
6857 +int nfssvc_encode_void(struct svc_rqst *, __u32 *, void *);
6858 +int nfssvc_encode_attrstat(struct svc_rqst *, __u32 *, struct nfsd_attrstat *);
6859 +int nfssvc_encode_diropres(struct svc_rqst *, __u32 *, struct nfsd_diropres *);
6860 +int nfssvc_encode_readlinkres(struct svc_rqst *, __u32 *, struct nfsd_readlinkres *);
6861 +int nfssvc_encode_readres(struct svc_rqst *, __u32 *, struct nfsd_readres *);
6862 +int nfssvc_encode_statfsres(struct svc_rqst *, __u32 *, struct nfsd_statfsres *);
6863 +int nfssvc_encode_readdirres(struct svc_rqst *, __u32 *, struct nfsd_readdirres *);
6865 int nfssvc_encode_entry(struct readdir_cd *, const char *name,
6866 int namlen, loff_t offset, ino_t ino, unsigned int);
6868 -int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
6869 +int nfssvc_release_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
6871 #endif /* LINUX_NFSD_H */
6872 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr3.h linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr3.h
6873 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr3.h 2004-08-18 13:16:07.000000000 -0500
6874 +++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr3.h 2004-08-26 05:42:08.000000000 -0500
6875 @@ -101,7 +101,7 @@
6876 __u32 dircount;
6877 __u32 count;
6878 __u32 * verf;
6879 - u32 * buffer;
6880 + __u32 * buffer;
6881 };
6883 struct nfsd3_commitargs {
6884 @@ -167,10 +167,10 @@
6885 __u32 verf[2];
6887 struct readdir_cd common;
6888 - u32 * buffer;
6889 + __u32 * buffer;
6890 int buflen;
6891 - u32 * offset;
6892 - u32 * offset1;
6893 + __u32 * offset;
6894 + __u32 * offset1;
6895 struct svc_rqst * rqstp;
6897 };
6898 @@ -245,70 +245,70 @@
6900 #define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore)
6902 -int nfs3svc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
6903 -int nfs3svc_decode_sattrargs(struct svc_rqst *, u32 *,
6904 +int nfs3svc_decode_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
6905 +int nfs3svc_decode_sattrargs(struct svc_rqst *, __u32 *,
6906 struct nfsd3_sattrargs *);
6907 -int nfs3svc_decode_diropargs(struct svc_rqst *, u32 *,
6908 +int nfs3svc_decode_diropargs(struct svc_rqst *, __u32 *,
6909 struct nfsd3_diropargs *);
6910 -int nfs3svc_decode_accessargs(struct svc_rqst *, u32 *,
6911 +int nfs3svc_decode_accessargs(struct svc_rqst *, __u32 *,
6912 struct nfsd3_accessargs *);
6913 -int nfs3svc_decode_readargs(struct svc_rqst *, u32 *,
6914 +int nfs3svc_decode_readargs(struct svc_rqst *, __u32 *,
6915 struct nfsd3_readargs *);
6916 -int nfs3svc_decode_writeargs(struct svc_rqst *, u32 *,
6917 +int nfs3svc_decode_writeargs(struct svc_rqst *, __u32 *,
6918 struct nfsd3_writeargs *);
6919 -int nfs3svc_decode_createargs(struct svc_rqst *, u32 *,
6920 +int nfs3svc_decode_createargs(struct svc_rqst *, __u32 *,
6921 struct nfsd3_createargs *);
6922 -int nfs3svc_decode_mkdirargs(struct svc_rqst *, u32 *,
6923 +int nfs3svc_decode_mkdirargs(struct svc_rqst *, __u32 *,
6924 struct nfsd3_createargs *);
6925 -int nfs3svc_decode_mknodargs(struct svc_rqst *, u32 *,
6926 +int nfs3svc_decode_mknodargs(struct svc_rqst *, __u32 *,
6927 struct nfsd3_mknodargs *);
6928 -int nfs3svc_decode_renameargs(struct svc_rqst *, u32 *,
6929 +int nfs3svc_decode_renameargs(struct svc_rqst *, __u32 *,
6930 struct nfsd3_renameargs *);
6931 -int nfs3svc_decode_readlinkargs(struct svc_rqst *, u32 *,
6932 +int nfs3svc_decode_readlinkargs(struct svc_rqst *, __u32 *,
6933 struct nfsd3_readlinkargs *);
6934 -int nfs3svc_decode_linkargs(struct svc_rqst *, u32 *,
6935 +int nfs3svc_decode_linkargs(struct svc_rqst *, __u32 *,
6936 struct nfsd3_linkargs *);
6937 -int nfs3svc_decode_symlinkargs(struct svc_rqst *, u32 *,
6938 +int nfs3svc_decode_symlinkargs(struct svc_rqst *, __u32 *,
6939 struct nfsd3_symlinkargs *);
6940 -int nfs3svc_decode_readdirargs(struct svc_rqst *, u32 *,
6941 +int nfs3svc_decode_readdirargs(struct svc_rqst *, __u32 *,
6942 struct nfsd3_readdirargs *);
6943 -int nfs3svc_decode_readdirplusargs(struct svc_rqst *, u32 *,
6944 +int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __u32 *,
6945 struct nfsd3_readdirargs *);
6946 -int nfs3svc_decode_commitargs(struct svc_rqst *, u32 *,
6947 +int nfs3svc_decode_commitargs(struct svc_rqst *, __u32 *,
6948 struct nfsd3_commitargs *);
6949 -int nfs3svc_encode_voidres(struct svc_rqst *, u32 *, void *);
6950 -int nfs3svc_encode_attrstat(struct svc_rqst *, u32 *,
6951 +int nfs3svc_encode_voidres(struct svc_rqst *, __u32 *, void *);
6952 +int nfs3svc_encode_attrstat(struct svc_rqst *, __u32 *,
6953 struct nfsd3_attrstat *);
6954 -int nfs3svc_encode_wccstat(struct svc_rqst *, u32 *,
6955 +int nfs3svc_encode_wccstat(struct svc_rqst *, __u32 *,
6956 struct nfsd3_attrstat *);
6957 -int nfs3svc_encode_diropres(struct svc_rqst *, u32 *,
6958 +int nfs3svc_encode_diropres(struct svc_rqst *, __u32 *,
6959 struct nfsd3_diropres *);
6960 -int nfs3svc_encode_accessres(struct svc_rqst *, u32 *,
6961 +int nfs3svc_encode_accessres(struct svc_rqst *, __u32 *,
6962 struct nfsd3_accessres *);
6963 -int nfs3svc_encode_readlinkres(struct svc_rqst *, u32 *,
6964 +int nfs3svc_encode_readlinkres(struct svc_rqst *, __u32 *,
6965 struct nfsd3_readlinkres *);
6966 -int nfs3svc_encode_readres(struct svc_rqst *, u32 *, struct nfsd3_readres *);
6967 -int nfs3svc_encode_writeres(struct svc_rqst *, u32 *, struct nfsd3_writeres *);
6968 -int nfs3svc_encode_createres(struct svc_rqst *, u32 *,
6969 +int nfs3svc_encode_readres(struct svc_rqst *, __u32 *, struct nfsd3_readres *);
6970 +int nfs3svc_encode_writeres(struct svc_rqst *, __u32 *, struct nfsd3_writeres *);
6971 +int nfs3svc_encode_createres(struct svc_rqst *, __u32 *,
6972 struct nfsd3_diropres *);
6973 -int nfs3svc_encode_renameres(struct svc_rqst *, u32 *,
6974 +int nfs3svc_encode_renameres(struct svc_rqst *, __u32 *,
6975 struct nfsd3_renameres *);
6976 -int nfs3svc_encode_linkres(struct svc_rqst *, u32 *,
6977 +int nfs3svc_encode_linkres(struct svc_rqst *, __u32 *,
6978 struct nfsd3_linkres *);
6979 -int nfs3svc_encode_readdirres(struct svc_rqst *, u32 *,
6980 +int nfs3svc_encode_readdirres(struct svc_rqst *, __u32 *,
6981 struct nfsd3_readdirres *);
6982 -int nfs3svc_encode_fsstatres(struct svc_rqst *, u32 *,
6983 +int nfs3svc_encode_fsstatres(struct svc_rqst *, __u32 *,
6984 struct nfsd3_fsstatres *);
6985 -int nfs3svc_encode_fsinfores(struct svc_rqst *, u32 *,
6986 +int nfs3svc_encode_fsinfores(struct svc_rqst *, __u32 *,
6987 struct nfsd3_fsinfores *);
6988 -int nfs3svc_encode_pathconfres(struct svc_rqst *, u32 *,
6989 +int nfs3svc_encode_pathconfres(struct svc_rqst *, __u32 *,
6990 struct nfsd3_pathconfres *);
6991 -int nfs3svc_encode_commitres(struct svc_rqst *, u32 *,
6992 +int nfs3svc_encode_commitres(struct svc_rqst *, __u32 *,
6993 struct nfsd3_commitres *);
6995 -int nfs3svc_release_fhandle(struct svc_rqst *, u32 *,
6996 +int nfs3svc_release_fhandle(struct svc_rqst *, __u32 *,
6997 struct nfsd3_attrstat *);
6998 -int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *,
6999 +int nfs3svc_release_fhandle2(struct svc_rqst *, __u32 *,
7000 struct nfsd3_fhandle_pair *);
7001 int nfs3svc_encode_entry(struct readdir_cd *, const char *name,
7002 int namlen, loff_t offset, ino_t ino,
7003 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr4.h linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr4.h
7004 --- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr4.h 2004-08-18 13:16:07.000000000 -0500
7005 +++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr4.h 2004-08-26 05:42:08.000000000 -0500
7006 @@ -42,9 +42,9 @@
7007 #define NFSD4_MAX_TAGLEN 128
7008 #define XDR_LEN(n) (((n) + 3) & ~3)
7010 -typedef u32 delegation_zero_t;
7011 -typedef u32 delegation_boot_t;
7012 -typedef u64 delegation_id_t;
7013 +typedef __u32 delegation_zero_t;
7014 +typedef __u32 delegation_boot_t;
7015 +typedef __u64 delegation_id_t;
7017 typedef struct {
7018 delegation_zero_t ds_zero;
7019 @@ -53,46 +53,46 @@
7020 } delegation_stateid_t;
7022 struct nfsd4_change_info {
7023 - u32 atomic;
7024 - u32 before_ctime_sec;
7025 - u32 before_ctime_nsec;
7026 - u32 after_ctime_sec;
7027 - u32 after_ctime_nsec;
7028 + __u32 atomic;
7029 + __u32 before_ctime_sec;
7030 + __u32 before_ctime_nsec;
7031 + __u32 after_ctime_sec;
7032 + __u32 after_ctime_nsec;
7033 };
7035 struct nfsd4_access {
7036 - u32 ac_req_access; /* request */
7037 - u32 ac_supported; /* response */
7038 - u32 ac_resp_access; /* response */
7039 + __u32 ac_req_access; /* request */
7040 + __u32 ac_supported; /* response */
7041 + __u32 ac_resp_access; /* response */
7042 };
7044 struct nfsd4_close {
7045 - u32 cl_seqid; /* request */
7046 + __u32 cl_seqid; /* request */
7047 stateid_t cl_stateid; /* request+response */
7048 struct nfs4_stateowner * cl_stateowner; /* response */
7049 };
7051 struct nfsd4_commit {
7052 - u64 co_offset; /* request */
7053 - u32 co_count; /* request */
7054 + __u64 co_offset; /* request */
7055 + __u32 co_count; /* request */
7056 nfs4_verifier co_verf; /* response */
7057 };
7059 struct nfsd4_create {
7060 - u32 cr_namelen; /* request */
7061 + __u32 cr_namelen; /* request */
7062 char * cr_name; /* request */
7063 - u32 cr_type; /* request */
7064 + __u32 cr_type; /* request */
7065 union { /* request */
7066 struct {
7067 - u32 namelen;
7068 + __u32 namelen;
7069 char *name;
7070 } link; /* NF4LNK */
7071 struct {
7072 - u32 specdata1;
7073 - u32 specdata2;
7074 + __u32 specdata1;
7075 + __u32 specdata2;
7076 } dev; /* NF4BLK, NF4CHR */
7077 } u;
7078 - u32 cr_bmval[2]; /* request */
7079 + __u32 cr_bmval[2]; /* request */
7080 struct iattr cr_iattr; /* request */
7081 struct nfsd4_change_info cr_cinfo; /* response */
7082 };
7083 @@ -102,41 +102,41 @@
7084 #define cr_specdata2 u.dev.specdata2
7086 struct nfsd4_getattr {
7087 - u32 ga_bmval[2]; /* request */
7088 + __u32 ga_bmval[2]; /* request */
7089 struct svc_fh *ga_fhp; /* response */
7090 };
7092 struct nfsd4_link {
7093 - u32 li_namelen; /* request */
7094 + __u32 li_namelen; /* request */
7095 char * li_name; /* request */
7096 struct nfsd4_change_info li_cinfo; /* response */
7097 };
7099 struct nfsd4_lock_denied {
7100 struct nfs4_stateowner *ld_sop;
7101 - u64 ld_start;
7102 - u64 ld_length;
7103 - u32 ld_type;
7104 + __u64 ld_start;
7105 + __u64 ld_length;
7106 + __u32 ld_type;
7107 };
7109 struct nfsd4_lock {
7110 /* request */
7111 - u32 lk_type;
7112 - u32 lk_reclaim; /* boolean */
7113 - u64 lk_offset;
7114 - u64 lk_length;
7115 - u32 lk_is_new;
7116 + __u32 lk_type;
7117 + __u32 lk_reclaim; /* boolean */
7118 + __u64 lk_offset;
7119 + __u64 lk_length;
7120 + __u32 lk_is_new;
7121 union {
7122 struct {
7123 - u32 open_seqid;
7124 + __u32 open_seqid;
7125 stateid_t open_stateid;
7126 - u32 lock_seqid;
7127 + __u32 lock_seqid;
7128 clientid_t clientid;
7129 struct xdr_netobj owner;
7130 } new;
7131 struct {
7132 stateid_t lock_stateid;
7133 - u32 lock_seqid;
7134 + __u32 lock_seqid;
7135 } old;
7136 } v;
7138 @@ -164,56 +164,56 @@
7141 struct nfsd4_lockt {
7142 - u32 lt_type;
7143 + __u32 lt_type;
7144 clientid_t lt_clientid;
7145 struct xdr_netobj lt_owner;
7146 - u64 lt_offset;
7147 - u64 lt_length;
7148 + __u64 lt_offset;
7149 + __u64 lt_length;
7150 struct nfs4_stateowner * lt_stateowner;
7151 struct nfsd4_lock_denied lt_denied;
7152 };
7155 struct nfsd4_locku {
7156 - u32 lu_type;
7157 - u32 lu_seqid;
7158 + __u32 lu_type;
7159 + __u32 lu_seqid;
7160 stateid_t lu_stateid;
7161 - u64 lu_offset;
7162 - u64 lu_length;
7163 + __u64 lu_offset;
7164 + __u64 lu_length;
7165 struct nfs4_stateowner *lu_stateowner;
7166 };
7169 struct nfsd4_lookup {
7170 - u32 lo_len; /* request */
7171 + __u32 lo_len; /* request */
7172 char * lo_name; /* request */
7173 };
7175 struct nfsd4_putfh {
7176 - u32 pf_fhlen; /* request */
7177 + __u32 pf_fhlen; /* request */
7178 char *pf_fhval; /* request */
7179 };
7181 struct nfsd4_open {
7182 - u32 op_claim_type; /* request */
7183 + __u32 op_claim_type; /* request */
7184 struct xdr_netobj op_fname; /* request - everything but CLAIM_PREV */
7185 - u32 op_delegate_type; /* request - CLAIM_PREV only */
7186 + __u32 op_delegate_type; /* request - CLAIM_PREV only */
7187 delegation_stateid_t op_delegate_stateid; /* request - CLAIM_DELEGATE_CUR only */
7188 - u32 op_create; /* request */
7189 - u32 op_createmode; /* request */
7190 - u32 op_bmval[2]; /* request */
7191 + __u32 op_create; /* request */
7192 + __u32 op_createmode; /* request */
7193 + __u32 op_bmval[2]; /* request */
7194 union { /* request */
7195 struct iattr iattr; /* UNCHECKED4,GUARDED4 */
7196 nfs4_verifier verf; /* EXCLUSIVE4 */
7197 } u;
7198 clientid_t op_clientid; /* request */
7199 struct xdr_netobj op_owner; /* request */
7200 - u32 op_seqid; /* request */
7201 - u32 op_share_access; /* request */
7202 - u32 op_share_deny; /* request */
7203 + __u32 op_seqid; /* request */
7204 + __u32 op_share_access; /* request */
7205 + __u32 op_share_deny; /* request */
7206 stateid_t op_stateid; /* response */
7207 struct nfsd4_change_info op_cinfo; /* response */
7208 - u32 op_rflags; /* response */
7209 + __u32 op_rflags; /* response */
7210 int op_truncate; /* used during processing */
7211 struct nfs4_stateowner *op_stateowner; /* used during processing */
7213 @@ -223,24 +223,24 @@
7215 struct nfsd4_open_confirm {
7216 stateid_t oc_req_stateid /* request */;
7217 - u32 oc_seqid /* request */;
7218 + __u32 oc_seqid /* request */;
7219 stateid_t oc_resp_stateid /* response */;
7220 struct nfs4_stateowner * oc_stateowner; /* response */
7221 };
7223 struct nfsd4_open_downgrade {
7224 stateid_t od_stateid;
7225 - u32 od_seqid;
7226 - u32 od_share_access;
7227 - u32 od_share_deny;
7228 + __u32 od_seqid;
7229 + __u32 od_share_access;
7230 + __u32 od_share_deny;
7231 struct nfs4_stateowner *od_stateowner;
7232 };
7235 struct nfsd4_read {
7236 stateid_t rd_stateid; /* request */
7237 - u64 rd_offset; /* request */
7238 - u32 rd_length; /* request */
7239 + __u64 rd_offset; /* request */
7240 + __u32 rd_length; /* request */
7241 struct kvec rd_iov[RPCSVC_MAXPAGES];
7242 int rd_vlen;
7244 @@ -249,18 +249,18 @@
7245 };
7247 struct nfsd4_readdir {
7248 - u64 rd_cookie; /* request */
7249 + __u64 rd_cookie; /* request */
7250 nfs4_verifier rd_verf; /* request */
7251 - u32 rd_dircount; /* request */
7252 - u32 rd_maxcount; /* request */
7253 - u32 rd_bmval[2]; /* request */
7254 + __u32 rd_dircount; /* request */
7255 + __u32 rd_maxcount; /* request */
7256 + __u32 rd_bmval[2]; /* request */
7257 struct svc_rqst *rd_rqstp; /* response */
7258 struct svc_fh * rd_fhp; /* response */
7260 struct readdir_cd common;
7261 - u32 * buffer;
7262 + __u32 * buffer;
7263 int buflen;
7264 - u32 * offset;
7265 + __u32 * offset;
7266 };
7268 struct nfsd4_release_lockowner {
7269 @@ -273,15 +273,15 @@
7270 };
7272 struct nfsd4_remove {
7273 - u32 rm_namelen; /* request */
7274 + __u32 rm_namelen; /* request */
7275 char * rm_name; /* request */
7276 struct nfsd4_change_info rm_cinfo; /* response */
7277 };
7279 struct nfsd4_rename {
7280 - u32 rn_snamelen; /* request */
7281 + __u32 rn_snamelen; /* request */
7282 char * rn_sname; /* request */
7283 - u32 rn_tnamelen; /* request */
7284 + __u32 rn_tnamelen; /* request */
7285 char * rn_tname; /* request */
7286 struct nfsd4_change_info rn_sinfo; /* response */
7287 struct nfsd4_change_info rn_tinfo; /* response */
7288 @@ -289,20 +289,20 @@
7290 struct nfsd4_setattr {
7291 stateid_t sa_stateid; /* request */
7292 - u32 sa_bmval[2]; /* request */
7293 + __u32 sa_bmval[2]; /* request */
7294 struct iattr sa_iattr; /* request */
7295 };
7297 struct nfsd4_setclientid {
7298 nfs4_verifier se_verf; /* request */
7299 - u32 se_namelen; /* request */
7300 + __u32 se_namelen; /* request */
7301 char * se_name; /* request */
7302 - u32 se_callback_prog; /* request */
7303 - u32 se_callback_netid_len; /* request */
7304 + __u32 se_callback_prog; /* request */
7305 + __u32 se_callback_netid_len; /* request */
7306 char * se_callback_netid_val; /* request */
7307 - u32 se_callback_addr_len; /* request */
7308 + __u32 se_callback_addr_len; /* request */
7309 char * se_callback_addr_val; /* request */
7310 - u32 se_callback_ident; /* request */
7311 + __u32 se_callback_ident; /* request */
7312 clientid_t se_clientid; /* response */
7313 nfs4_verifier se_confirm; /* response */
7314 };
7315 @@ -314,21 +314,21 @@
7317 /* also used for NVERIFY */
7318 struct nfsd4_verify {
7319 - u32 ve_bmval[2]; /* request */
7320 - u32 ve_attrlen; /* request */
7321 + __u32 ve_bmval[2]; /* request */
7322 + __u32 ve_attrlen; /* request */
7323 char * ve_attrval; /* request */
7324 };
7326 struct nfsd4_write {
7327 stateid_t wr_stateid; /* request */
7328 - u64 wr_offset; /* request */
7329 - u32 wr_stable_how; /* request */
7330 - u32 wr_buflen; /* request */
7331 + __u64 wr_offset; /* request */
7332 + __u32 wr_stable_how; /* request */
7333 + __u32 wr_buflen; /* request */
7334 struct kvec wr_vec[RPCSVC_MAXPAGES]; /* request */
7335 int wr_vlen;
7337 - u32 wr_bytes_written; /* response */
7338 - u32 wr_how_written; /* response */
7339 + __u32 wr_bytes_written; /* response */
7340 + __u32 wr_how_written; /* response */
7341 nfs4_verifier wr_verifier; /* response */
7342 };
7344 @@ -370,12 +370,12 @@
7346 struct nfsd4_compoundargs {
7347 /* scratch variables for XDR decode */
7348 - u32 * p;
7349 - u32 * end;
7350 + __u32 * p;
7351 + __u32 * end;
7352 struct page ** pagelist;
7353 int pagelen;
7354 - u32 tmp[8];
7355 - u32 * tmpp;
7356 + __u32 tmp[8];
7357 + __u32 * tmpp;
7358 struct tmpbuf {
7359 struct tmpbuf *next;
7360 void (*release)(const void *);
7361 @@ -384,25 +384,25 @@
7363 struct svc_rqst *rqstp;
7365 - u32 taglen;
7366 + __u32 taglen;
7367 char * tag;
7368 - u32 minorversion;
7369 - u32 opcnt;
7370 + __u32 minorversion;
7371 + __u32 opcnt;
7372 struct nfsd4_op *ops;
7373 struct nfsd4_op iops[8];
7374 };
7376 struct nfsd4_compoundres {
7377 /* scratch variables for XDR encode */
7378 - u32 * p;
7379 - u32 * end;
7380 + __u32 * p;
7381 + __u32 * end;
7382 struct xdr_buf * xbuf;
7383 struct svc_rqst * rqstp;
7385 - u32 taglen;
7386 + __u32 taglen;
7387 char * tag;
7388 - u32 opcnt;
7389 - u32 * tagp; /* where to encode tag and opcount */
7390 + __u32 opcnt;
7391 + __u32 * tagp; /* where to encode tag and opcount */
7392 };
7394 #define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs)
7395 @@ -418,16 +418,16 @@
7396 cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec;
7397 }
7399 -int nfs4svc_encode_voidres(struct svc_rqst *, u32 *, void *);
7400 -int nfs4svc_decode_compoundargs(struct svc_rqst *, u32 *,
7401 +int nfs4svc_encode_voidres(struct svc_rqst *, __u32 *, void *);
7402 +int nfs4svc_decode_compoundargs(struct svc_rqst *, __u32 *,
7403 struct nfsd4_compoundargs *);
7404 -int nfs4svc_encode_compoundres(struct svc_rqst *, u32 *,
7405 +int nfs4svc_encode_compoundres(struct svc_rqst *, __u32 *,
7406 struct nfsd4_compoundres *);
7407 void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);
7408 void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op);
7409 int nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
7410 - struct dentry *dentry, u32 *buffer, int *countp,
7411 - u32 *bmval, struct svc_rqst *);
7412 + struct dentry *dentry, __u32 *buffer, int *countp,
7413 + __u32 *bmval, struct svc_rqst *);
7414 extern int nfsd4_setclientid(struct svc_rqst *rqstp,
7415 struct nfsd4_setclientid *setclid);
7416 extern int nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
7417 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/pmu.h linux-libc-headers-2.6.8.0/include/linux/pmu.h
7418 --- linux-libc-headers-2.6.8.0-dist/include/linux/pmu.h 2004-01-17 17:04:31.000000000 -0600
7419 +++ linux-libc-headers-2.6.8.0/include/linux/pmu.h 2004-08-26 05:42:08.000000000 -0500
7420 @@ -120,15 +120,15 @@
7422 /* no param */
7423 #define PMU_IOC_SLEEP _IO('B', 0)
7424 -/* out param: u32* backlight value: 0 to 15 */
7425 +/* out param: __u32* backlight value: 0 to 15 */
7426 #define PMU_IOC_GET_BACKLIGHT _IOR('B', 1, size_t)
7427 -/* in param: u32 backlight value: 0 to 15 */
7428 +/* in param: __u32 backlight value: 0 to 15 */
7429 #define PMU_IOC_SET_BACKLIGHT _IOW('B', 2, size_t)
7430 -/* out param: u32* PMU model */
7431 +/* out param: __u32* PMU model */
7432 #define PMU_IOC_GET_MODEL _IOR('B', 3, size_t)
7433 -/* out param: u32* has_adb: 0 or 1 */
7434 +/* out param: __u32* has_adb: 0 or 1 */
7435 #define PMU_IOC_HAS_ADB _IOR('B', 4, size_t)
7436 -/* out param: u32* can_sleep: 0 or 1 */
7437 +/* out param: __u32* can_sleep: 0 or 1 */
7438 #define PMU_IOC_CAN_SLEEP _IOR('B', 5, size_t)
7439 /* no param, but historically was _IOR('B', 6, 0), meaning 4 bytes */
7440 #define PMU_IOC_GRAB_BACKLIGHT _IOR('B', 6, size_t)
7441 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/reiserfs_fs.h linux-libc-headers-2.6.8.0/include/linux/reiserfs_fs.h
7442 --- linux-libc-headers-2.6.8.0-dist/include/linux/reiserfs_fs.h 2004-08-18 13:16:04.000000000 -0500
7443 +++ linux-libc-headers-2.6.8.0/include/linux/reiserfs_fs.h 2004-08-26 13:26:06.000000000 -0500
7444 @@ -1821,7 +1821,7 @@
7445 * to use for a new object underneat it. The locality is returned
7446 * in disk byte order (le).
7447 */
7448 -u32 reiserfs_choose_packing(struct inode *dir);
7449 +__u32 reiserfs_choose_packing(struct inode *dir);
7451 int is_reusable (struct super_block * s, b_blocknr_t block, int bit_value);
7452 void reiserfs_free_block (struct reiserfs_transaction_handle *th, struct inode *, b_blocknr_t, int for_unformatted);
7453 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/scx200_gpio.h linux-libc-headers-2.6.8.0/include/linux/scx200_gpio.h
7454 --- linux-libc-headers-2.6.8.0-dist/include/linux/scx200_gpio.h 2004-01-17 17:04:32.000000000 -0600
7455 +++ linux-libc-headers-2.6.8.0/include/linux/scx200_gpio.h 2004-08-26 13:26:01.000000000 -0500
7456 @@ -1,5 +1,5 @@
7458 -u32 scx200_gpio_configure(int index, u32 set, u32 clear);
7459 +__u32 scx200_gpio_configure(int index, __u32 set, __u32 clear);
7460 void scx200_gpio_dump(unsigned index);
7462 extern unsigned scx200_gpio_base;
7463 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sdladrv.h linux-libc-headers-2.6.8.0/include/linux/sdladrv.h
7464 --- linux-libc-headers-2.6.8.0-dist/include/linux/sdladrv.h 2003-12-15 12:46:58.000000000 -0600
7465 +++ linux-libc-headers-2.6.8.0/include/linux/sdladrv.h 2004-08-26 05:42:08.000000000 -0500
7466 @@ -55,8 +55,8 @@
7467 extern int sdla_inten (sdlahw_t* hw);
7468 extern int sdla_intde (sdlahw_t* hw);
7469 extern int sdla_intack (sdlahw_t* hw);
7470 -extern void S514_intack (sdlahw_t* hw, u32 int_status);
7471 -extern void read_S514_int_stat (sdlahw_t* hw, u32* int_status);
7472 +extern void S514_intack (sdlahw_t* hw, __u32 int_status);
7473 +extern void read_S514_int_stat (sdlahw_t* hw, __u32* int_status);
7474 extern int sdla_intr (sdlahw_t* hw);
7475 extern int sdla_mapmem (sdlahw_t* hw, unsigned long addr);
7476 extern int sdla_peek (sdlahw_t* hw, unsigned long addr, void* buf,
7477 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/selection.h linux-libc-headers-2.6.8.0/include/linux/selection.h
7478 --- linux-libc-headers-2.6.8.0-dist/include/linux/selection.h 2004-06-23 16:52:56.000000000 -0500
7479 +++ linux-libc-headers-2.6.8.0/include/linux/selection.h 2004-08-26 05:42:08.000000000 -0500
7480 @@ -32,14 +32,14 @@
7481 extern int default_blu[];
7483 extern unsigned short *screen_pos(int currcons, int w_offset, int viewed);
7484 -extern u16 screen_glyph(int currcons, int offset);
7485 +extern __u16 screen_glyph(int currcons, int offset);
7486 extern void complement_pos(int currcons, int offset);
7487 extern void invert_screen(int currcons, int offset, int count, int shift);
7489 extern void getconsxy(int currcons, unsigned char *p);
7490 extern void putconsxy(int currcons, unsigned char *p);
7492 -extern u16 vcs_scr_readw(int currcons, const u16 *org);
7493 -extern void vcs_scr_writew(int currcons, u16 val, u16 *org);
7494 +extern __u16 vcs_scr_readw(int currcons, const __u16 *org);
7495 +extern void vcs_scr_writew(int currcons, __u16 val, __u16 *org);
7497 #endif
7498 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/serialP.h linux-libc-headers-2.6.8.0/include/linux/serialP.h
7499 --- linux-libc-headers-2.6.8.0-dist/include/linux/serialP.h 2004-08-18 13:16:04.000000000 -0500
7500 +++ linux-libc-headers-2.6.8.0/include/linux/serialP.h 2004-08-26 05:42:08.000000000 -0500
7501 @@ -39,8 +39,8 @@
7502 int xmit_fifo_size;
7503 int custom_divisor;
7504 int count;
7505 - u8 *iomem_base;
7506 - u16 iomem_reg_shift;
7507 + __u8 *iomem_base;
7508 + __u16 iomem_reg_shift;
7509 unsigned short close_delay;
7510 unsigned short closing_wait; /* time to wait before closing */
7511 struct async_icount icount;
7512 @@ -75,8 +75,8 @@
7513 int blocked_open; /* # of blocked opens */
7514 struct circ_buf xmit;
7515 spinlock_t xmit_lock;
7516 - u8 *iomem_base;
7517 - u16 iomem_reg_shift;
7518 + __u8 *iomem_base;
7519 + __u16 iomem_reg_shift;
7520 int io_type;
7521 struct work_struct work;
7522 struct tasklet_struct tlet;
7523 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/clnt.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/clnt.h
7524 --- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/clnt.h 2004-02-29 10:36:05.000000000 -0600
7525 +++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/clnt.h 2004-08-26 05:42:08.000000000 -0500
7526 @@ -36,7 +36,7 @@
7527 atomic_t cl_users; /* number of references */
7528 struct rpc_xprt * cl_xprt; /* transport */
7529 struct rpc_procinfo * cl_procinfo; /* procedure info */
7530 - u32 cl_maxproc; /* max procedure number */
7531 + __u32 cl_maxproc; /* max procedure number */
7533 char * cl_server; /* server machine name */
7534 char * cl_protname; /* protocol name */
7535 @@ -75,7 +75,7 @@
7536 #define RPC_MAXVERSION 4
7537 struct rpc_program {
7538 char * name; /* protocol name */
7539 - u32 number; /* program number */
7540 + __u32 number; /* program number */
7541 unsigned int nrvers; /* number of versions */
7542 struct rpc_version ** version; /* version array */
7543 struct rpc_stat * stats; /* statistics */
7544 @@ -83,7 +83,7 @@
7545 };
7547 struct rpc_version {
7548 - u32 number; /* version number */
7549 + __u32 number; /* version number */
7550 unsigned int nrprocs; /* number of procs */
7551 struct rpc_procinfo * procs; /* procedure array */
7552 };
7553 @@ -92,7 +92,7 @@
7554 * Procedure information
7555 */
7556 struct rpc_procinfo {
7557 - u32 p_proc; /* RPC procedure number */
7558 + __u32 p_proc; /* RPC procedure number */
7559 kxdrproc_t p_encode; /* XDR encode function */
7560 kxdrproc_t p_decode; /* XDR decode function */
7561 unsigned int p_bufsiz; /* req. buffer size */
7562 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_asn1.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_asn1.h
7563 --- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_asn1.h 2004-06-23 16:52:58.000000000 -0500
7564 +++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_asn1.h 2004-08-26 13:26:25.000000000 -0500
7565 @@ -64,14 +64,14 @@
7566 (((o1)->len == (o2)->len) && \
7567 (memcmp((o1)->data,(o2)->data,(int) (o1)->len) == 0))
7569 -u32 g_verify_token_header(
7570 +__u32 g_verify_token_header(
7571 struct xdr_netobj *mech,
7572 int *body_size,
7573 unsigned char **buf_in,
7574 int tok_type,
7575 int toksize);
7577 -u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf);
7578 +__u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf);
7580 int g_token_size(
7581 struct xdr_netobj *mech,
7582 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_krb5.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_krb5.h
7583 --- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_krb5.h 2004-06-23 16:52:58.000000000 -0500
7584 +++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_krb5.h 2004-08-26 13:26:21.000000000 -0500
7585 @@ -46,8 +46,8 @@
7586 int sealalg;
7587 struct crypto_tfm *enc;
7588 struct crypto_tfm *seq;
7589 - s32 endtime;
7590 - u32 seq_send;
7591 + __s32 endtime;
7592 + __u32 seq_send;
7593 struct xdr_netobj mech_used;
7594 };
7596 @@ -112,35 +112,35 @@
7597 #define ENCTYPE_DES3_CBC_SHA1 0x0010
7598 #define ENCTYPE_UNKNOWN 0x01ff
7600 -s32
7601 -make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
7602 +__s32
7603 +make_checksum(__s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
7604 struct xdr_netobj *cksum);
7606 -u32
7607 +__u32
7608 krb5_make_token(struct krb5_ctx *context_handle, int qop_req,
7609 struct xdr_buf *input_message_buffer,
7610 struct xdr_netobj *output_message_buffer, int toktype);
7612 -u32
7613 +__u32
7614 krb5_read_token(struct krb5_ctx *context_handle,
7615 struct xdr_netobj *input_token_buffer,
7616 struct xdr_buf *message_buffer,
7617 int *qop_state, int toktype);
7619 -u32
7620 +__u32
7621 krb5_encrypt(struct crypto_tfm * key,
7622 void *iv, void *in, void *out, int length);
7624 -u32
7625 +__u32
7626 krb5_decrypt(struct crypto_tfm * key,
7627 void *iv, void *in, void *out, int length);
7629 -s32
7630 +__s32
7631 krb5_make_seq_num(struct crypto_tfm * key,
7632 int direction,
7633 - s32 seqnum, unsigned char *cksum, unsigned char *buf);
7634 + __s32 seqnum, unsigned char *cksum, unsigned char *buf);
7636 -s32
7637 +__s32
7638 krb5_get_seq_num(struct crypto_tfm * key,
7639 unsigned char *cksum,
7640 - unsigned char *buf, int *direction, s32 * seqnum);
7641 + unsigned char *buf, int *direction, __s32 * seqnum);
7642 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/svc.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/svc.h
7643 --- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/svc.h 2004-08-18 13:16:07.000000000 -0500
7644 +++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/svc.h 2004-08-26 05:42:08.000000000 -0500
7645 @@ -75,20 +75,20 @@
7646 */
7647 #define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2)
7649 -static inline u32 svc_getu32(struct kvec *iov)
7650 +static inline __u32 svc_getu32(struct kvec *iov)
7651 {
7652 - u32 val, *vp;
7653 + __u32 val, *vp;
7654 vp = iov->iov_base;
7655 val = *vp++;
7656 iov->iov_base = (void*)vp;
7657 - iov->iov_len -= sizeof(u32);
7658 + iov->iov_len -= sizeof(__u32);
7659 return val;
7660 }
7661 -static inline void svc_putu32(struct kvec *iov, u32 val)
7662 +static inline void svc_putu32(struct kvec *iov, __u32 val)
7663 {
7664 - u32 *vp = iov->iov_base + iov->iov_len;
7665 + __u32 *vp = iov->iov_base + iov->iov_len;
7666 *vp = val;
7667 - iov->iov_len += sizeof(u32);
7668 + iov->iov_len += sizeof(__u32);
7669 }
7672 @@ -119,11 +119,11 @@
7673 short rq_arghi; /* pages available in argument page list */
7674 short rq_resused; /* pages used for result */
7676 - u32 rq_xid; /* transmission id */
7677 - u32 rq_prog; /* program number */
7678 - u32 rq_vers; /* program version */
7679 - u32 rq_proc; /* procedure number */
7680 - u32 rq_prot; /* IP protocol */
7681 + __u32 rq_xid; /* transmission id */
7682 + __u32 rq_prog; /* program number */
7683 + __u32 rq_vers; /* program version */
7684 + __u32 rq_proc; /* procedure number */
7685 + __u32 rq_prot; /* IP protocol */
7686 unsigned short
7687 rq_secure : 1; /* secure port */
7689 @@ -156,7 +156,7 @@
7690 * Check buffer bounds after decoding arguments
7691 */
7692 static inline int
7693 -xdr_argsize_check(struct svc_rqst *rqstp, u32 *p)
7694 +xdr_argsize_check(struct svc_rqst *rqstp, __u32 *p)
7695 {
7696 char *cp = (char *)p;
7697 struct kvec *vec = &rqstp->rq_arg.head[0];
7698 @@ -164,7 +164,7 @@
7699 }
7701 static inline int
7702 -xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
7703 +xdr_ressize_check(struct svc_rqst *rqstp, __u32 *p)
7704 {
7705 struct kvec *vec = &rqstp->rq_res.head[0];
7706 char *cp = (char*)p;
7707 @@ -220,19 +220,19 @@
7708 }
7710 struct svc_deferred_req {
7711 - u32 prot; /* protocol (UDP or TCP) */
7712 + __u32 prot; /* protocol (UDP or TCP) */
7713 struct sockaddr_in addr;
7714 struct svc_sock *svsk; /* where reply must go */
7715 struct cache_deferred_req handle;
7716 int argslen;
7717 - u32 args[0];
7718 + __u32 args[0];
7719 };
7721 /*
7722 * RPC program
7723 */
7724 struct svc_program {
7725 - u32 pg_prog; /* program number */
7726 + __u32 pg_prog; /* program number */
7727 unsigned int pg_lovers; /* lowest version */
7728 unsigned int pg_hivers; /* lowest version */
7729 unsigned int pg_nvers; /* number of versions */
7730 @@ -246,16 +246,16 @@
7731 * RPC program version
7732 */
7733 struct svc_version {
7734 - u32 vs_vers; /* version number */
7735 - u32 vs_nproc; /* number of procedures */
7736 + __u32 vs_vers; /* version number */
7737 + __u32 vs_nproc; /* number of procedures */
7738 struct svc_procedure * vs_proc; /* per-procedure info */
7739 - u32 vs_xdrsize; /* xdrsize needed for this version */
7740 + __u32 vs_xdrsize; /* xdrsize needed for this version */
7742 /* Override dispatch function (e.g. when caching replies).
7743 * A return value of 0 means drop the request.
7744 * vs_dispatch == NULL means use default dispatcher.
7745 */
7746 - int (*vs_dispatch)(struct svc_rqst *, u32 *);
7747 + int (*vs_dispatch)(struct svc_rqst *, __u32 *);
7748 };
7750 /*
7751 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/xprt.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/xprt.h
7752 --- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/xprt.h 2004-06-23 16:52:58.000000000 -0500
7753 +++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/xprt.h 2004-08-26 05:42:08.000000000 -0500
7754 @@ -93,7 +93,7 @@
7755 __u32 rq_xid; /* request XID */
7756 int rq_cong; /* has incremented xprt->cong */
7757 int rq_received; /* receive completed */
7758 - u32 rq_seqno; /* gss seq no. used on req. */
7759 + __u32 rq_seqno; /* gss seq no. used on req. */
7761 struct list_head rq_list;
7763 @@ -106,13 +106,13 @@
7764 /*
7765 * For authentication (e.g. auth_des)
7766 */
7767 - u32 rq_creddata[2];
7768 + __u32 rq_creddata[2];
7770 /*
7771 * Partial send handling
7772 */
7774 - u32 rq_bytes_sent; /* Bytes we have sent */
7775 + __u32 rq_bytes_sent; /* Bytes we have sent */
7777 unsigned long rq_xtime; /* when transmitted */
7778 int rq_ntrans;
7779 @@ -160,7 +160,7 @@
7780 /*
7781 * State of TCP reply receive stuff
7782 */
7783 - u32 tcp_recm, /* Fragment header */
7784 + __u32 tcp_recm, /* Fragment header */
7785 tcp_xid, /* Current XID */
7786 tcp_reclen, /* fragment length */
7787 tcp_offset; /* fragment offset */
7788 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/suspend.h linux-libc-headers-2.6.8.0/include/linux/suspend.h
7789 --- linux-libc-headers-2.6.8.0-dist/include/linux/suspend.h 2004-08-18 13:16:05.000000000 -0500
7790 +++ linux-libc-headers-2.6.8.0/include/linux/suspend.h 2004-08-26 05:42:08.000000000 -0500
7791 @@ -23,7 +23,7 @@
7792 #define SWAP_FILENAME_MAXLENGTH 32
7794 struct suspend_header {
7795 - u32 version_code;
7796 + __u32 version_code;
7797 unsigned long num_physpages;
7798 char machine[8];
7799 char version[20];
7800 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sysdev.h linux-libc-headers-2.6.8.0/include/linux/sysdev.h
7801 --- linux-libc-headers-2.6.8.0-dist/include/linux/sysdev.h 2004-03-28 07:52:11.000000000 -0600
7802 +++ linux-libc-headers-2.6.8.0/include/linux/sysdev.h 2004-08-26 05:42:08.000000000 -0500
7803 @@ -31,7 +31,7 @@
7805 /* Default operations for these types of devices */
7806 int (*shutdown)(struct sys_device *);
7807 - int (*suspend)(struct sys_device *, u32 state);
7808 + int (*suspend)(struct sys_device *, __u32 state);
7809 int (*resume)(struct sys_device *);
7810 struct kset kset;
7811 };
7812 @@ -50,7 +50,7 @@
7813 int (*add)(struct sys_device *);
7814 int (*remove)(struct sys_device *);
7815 int (*shutdown)(struct sys_device *);
7816 - int (*suspend)(struct sys_device *, u32 state);
7817 + int (*suspend)(struct sys_device *, __u32 state);
7818 int (*resume)(struct sys_device *);
7819 };
7821 @@ -65,7 +65,7 @@
7822 */
7824 struct sys_device {
7825 - u32 id;
7826 + __u32 id;
7827 struct sysdev_class * cls;
7828 struct kobject kobj;
7829 };
7830 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sysv_fs.h linux-libc-headers-2.6.8.0/include/linux/sysv_fs.h
7831 --- linux-libc-headers-2.6.8.0-dist/include/linux/sysv_fs.h 2003-12-15 12:46:58.000000000 -0600
7832 +++ linux-libc-headers-2.6.8.0/include/linux/sysv_fs.h 2004-08-26 05:42:08.000000000 -0500
7833 @@ -9,12 +9,12 @@
7836 /* inode numbers are 16 bit */
7837 -typedef u16 sysv_ino_t;
7838 +typedef __u16 sysv_ino_t;
7840 /* Block numbers are 24 bit, sometimes stored in 32 bit.
7841 On Coherent FS, they are always stored in PDP-11 manner: the least
7842 significant 16 bits come last. */
7843 -typedef u32 sysv_zone_t;
7844 +typedef __u32 sysv_zone_t;
7846 /* 0 is non-existent */
7847 #define SYSV_BADBL_INO 1 /* inode of bad blocks file */
7848 @@ -25,29 +25,29 @@
7849 #define XENIX_NICINOD 100 /* number of inode cache entries */
7850 #define XENIX_NICFREE 100 /* number of free block list chunk entries */
7851 struct xenix_super_block {
7852 - u16 s_isize; /* index of first data zone */
7853 - u32 s_fsize __packed2__; /* total number of zones of this fs */
7854 + __u16 s_isize; /* index of first data zone */
7855 + __u32 s_fsize __packed2__; /* total number of zones of this fs */
7856 /* the start of the free block list: */
7857 - u16 s_nfree; /* number of free blocks in s_free, <= XENIX_NICFREE */
7858 - u32 s_free[XENIX_NICFREE]; /* first free block list chunk */
7859 + __u16 s_nfree; /* number of free blocks in s_free, <= XENIX_NICFREE */
7860 + __u32 s_free[XENIX_NICFREE]; /* first free block list chunk */
7861 /* the cache of free inodes: */
7862 - u16 s_ninode; /* number of free inodes in s_inode, <= XENIX_NICINOD */
7863 + __u16 s_ninode; /* number of free inodes in s_inode, <= XENIX_NICINOD */
7864 sysv_ino_t s_inode[XENIX_NICINOD]; /* some free inodes */
7865 /* locks, not used by Linux: */
7866 char s_flock; /* lock during free block list manipulation */
7867 char s_ilock; /* lock during inode cache manipulation */
7868 char s_fmod; /* super-block modified flag */
7869 char s_ronly; /* flag whether fs is mounted read-only */
7870 - u32 s_time __packed2__; /* time of last super block update */
7871 - u32 s_tfree __packed2__; /* total number of free zones */
7872 - u16 s_tinode; /* total number of free inodes */
7873 - s16 s_dinfo[4]; /* device information ?? */
7874 + __u32 s_time __packed2__; /* time of last super block update */
7875 + __u32 s_tfree __packed2__; /* total number of free zones */
7876 + __u16 s_tinode; /* total number of free inodes */
7877 + __s16 s_dinfo[4]; /* device information ?? */
7878 char s_fname[6]; /* file system volume name */
7879 char s_fpack[6]; /* file system pack name */
7880 char s_clean; /* set to 0x46 when filesystem is properly unmounted */
7881 char s_fill[371];
7882 - s32 s_magic; /* version of file system */
7883 - s32 s_type; /* type of file system: 1 for 512 byte blocks
7884 + __s32 s_magic; /* version of file system */
7885 + __s32 s_type; /* type of file system: 1 for 512 byte blocks
7886 2 for 1024 byte blocks
7887 3 for 2048 byte blocks */
7889 @@ -63,61 +63,61 @@
7891 /* SystemV4 super-block data on disk */
7892 struct sysv4_super_block {
7893 - u16 s_isize; /* index of first data zone */
7894 - u16 s_pad0;
7895 - u32 s_fsize; /* total number of zones of this fs */
7896 + __u16 s_isize; /* index of first data zone */
7897 + __u16 s_pad0;
7898 + __u32 s_fsize; /* total number of zones of this fs */
7899 /* the start of the free block list: */
7900 - u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
7901 - u16 s_pad1;
7902 - u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
7903 + __u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
7904 + __u16 s_pad1;
7905 + __u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
7906 /* the cache of free inodes: */
7907 - u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
7908 - u16 s_pad2;
7909 + __u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
7910 + __u16 s_pad2;
7911 sysv_ino_t s_inode[SYSV_NICINOD]; /* some free inodes */
7912 /* locks, not used by Linux: */
7913 char s_flock; /* lock during free block list manipulation */
7914 char s_ilock; /* lock during inode cache manipulation */
7915 char s_fmod; /* super-block modified flag */
7916 char s_ronly; /* flag whether fs is mounted read-only */
7917 - u32 s_time; /* time of last super block update */
7918 - s16 s_dinfo[4]; /* device information ?? */
7919 - u32 s_tfree; /* total number of free zones */
7920 - u16 s_tinode; /* total number of free inodes */
7921 - u16 s_pad3;
7922 + __u32 s_time; /* time of last super block update */
7923 + __s16 s_dinfo[4]; /* device information ?? */
7924 + __u32 s_tfree; /* total number of free zones */
7925 + __u16 s_tinode; /* total number of free inodes */
7926 + __u16 s_pad3;
7927 char s_fname[6]; /* file system volume name */
7928 char s_fpack[6]; /* file system pack name */
7929 - s32 s_fill[12];
7930 - s32 s_state; /* file system state: 0x7c269d38-s_time means clean */
7931 - s32 s_magic; /* version of file system */
7932 - s32 s_type; /* type of file system: 1 for 512 byte blocks
7933 + __s32 s_fill[12];
7934 + __s32 s_state; /* file system state: 0x7c269d38-s_time means clean */
7935 + __s32 s_magic; /* version of file system */
7936 + __s32 s_type; /* type of file system: 1 for 512 byte blocks
7937 2 for 1024 byte blocks */
7938 };
7940 /* SystemV2 super-block data on disk */
7941 struct sysv2_super_block {
7942 - u16 s_isize; /* index of first data zone */
7943 - u32 s_fsize __packed2__; /* total number of zones of this fs */
7944 + __u16 s_isize; /* index of first data zone */
7945 + __u32 s_fsize __packed2__; /* total number of zones of this fs */
7946 /* the start of the free block list: */
7947 - u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
7948 - u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
7949 + __u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
7950 + __u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
7951 /* the cache of free inodes: */
7952 - u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
7953 + __u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
7954 sysv_ino_t s_inode[SYSV_NICINOD]; /* some free inodes */
7955 /* locks, not used by Linux: */
7956 char s_flock; /* lock during free block list manipulation */
7957 char s_ilock; /* lock during inode cache manipulation */
7958 char s_fmod; /* super-block modified flag */
7959 char s_ronly; /* flag whether fs is mounted read-only */
7960 - u32 s_time __packed2__; /* time of last super block update */
7961 - s16 s_dinfo[4]; /* device information ?? */
7962 - u32 s_tfree __packed2__; /* total number of free zones */
7963 - u16 s_tinode; /* total number of free inodes */
7964 + __u32 s_time __packed2__; /* time of last super block update */
7965 + __s16 s_dinfo[4]; /* device information ?? */
7966 + __u32 s_tfree __packed2__; /* total number of free zones */
7967 + __u16 s_tinode; /* total number of free inodes */
7968 char s_fname[6]; /* file system volume name */
7969 char s_fpack[6]; /* file system pack name */
7970 - s32 s_fill[14];
7971 - s32 s_state; /* file system state: 0xcb096f43 means clean */
7972 - s32 s_magic; /* version of file system */
7973 - s32 s_type; /* type of file system: 1 for 512 byte blocks
7974 + __s32 s_fill[14];
7975 + __s32 s_state; /* file system state: 0xcb096f43 means clean */
7976 + __s32 s_magic; /* version of file system */
7977 + __s32 s_type; /* type of file system: 1 for 512 byte blocks
7978 2 for 1024 byte blocks */
7979 };
7981 @@ -125,25 +125,25 @@
7982 #define V7_NICINOD 100 /* number of inode cache entries */
7983 #define V7_NICFREE 50 /* number of free block list chunk entries */
7984 struct v7_super_block {
7985 - u16 s_isize; /* index of first data zone */
7986 - u32 s_fsize __packed2__; /* total number of zones of this fs */
7987 + __u16 s_isize; /* index of first data zone */
7988 + __u32 s_fsize __packed2__; /* total number of zones of this fs */
7989 /* the start of the free block list: */
7990 - u16 s_nfree; /* number of free blocks in s_free, <= V7_NICFREE */
7991 - u32 s_free[V7_NICFREE]; /* first free block list chunk */
7992 + __u16 s_nfree; /* number of free blocks in s_free, <= V7_NICFREE */
7993 + __u32 s_free[V7_NICFREE]; /* first free block list chunk */
7994 /* the cache of free inodes: */
7995 - u16 s_ninode; /* number of free inodes in s_inode, <= V7_NICINOD */
7996 + __u16 s_ninode; /* number of free inodes in s_inode, <= V7_NICINOD */
7997 sysv_ino_t s_inode[V7_NICINOD]; /* some free inodes */
7998 /* locks, not used by Linux or V7: */
7999 char s_flock; /* lock during free block list manipulation */
8000 char s_ilock; /* lock during inode cache manipulation */
8001 char s_fmod; /* super-block modified flag */
8002 char s_ronly; /* flag whether fs is mounted read-only */
8003 - u32 s_time __packed2__; /* time of last super block update */
8004 + __u32 s_time __packed2__; /* time of last super block update */
8005 /* the following fields are not maintained by V7: */
8006 - u32 s_tfree __packed2__; /* total number of free zones */
8007 - u16 s_tinode; /* total number of free inodes */
8008 - u16 s_m; /* interleave factor */
8009 - u16 s_n; /* interleave factor */
8010 + __u32 s_tfree __packed2__; /* total number of free zones */
8011 + __u16 s_tinode; /* total number of free inodes */
8012 + __u16 s_m; /* interleave factor */
8013 + __u16 s_n; /* interleave factor */
8014 char s_fname[6]; /* file system name */
8015 char s_fpack[6]; /* file system pack name */
8016 };
8017 @@ -152,41 +152,41 @@
8018 #define COH_NICINOD 100 /* number of inode cache entries */
8019 #define COH_NICFREE 64 /* number of free block list chunk entries */
8020 struct coh_super_block {
8021 - u16 s_isize; /* index of first data zone */
8022 - u32 s_fsize __packed2__; /* total number of zones of this fs */
8023 + __u16 s_isize; /* index of first data zone */
8024 + __u32 s_fsize __packed2__; /* total number of zones of this fs */
8025 /* the start of the free block list: */
8026 - u16 s_nfree; /* number of free blocks in s_free, <= COH_NICFREE */
8027 - u32 s_free[COH_NICFREE] __packed2__; /* first free block list chunk */
8028 + __u16 s_nfree; /* number of free blocks in s_free, <= COH_NICFREE */
8029 + __u32 s_free[COH_NICFREE] __packed2__; /* first free block list chunk */
8030 /* the cache of free inodes: */
8031 - u16 s_ninode; /* number of free inodes in s_inode, <= COH_NICINOD */
8032 + __u16 s_ninode; /* number of free inodes in s_inode, <= COH_NICINOD */
8033 sysv_ino_t s_inode[COH_NICINOD]; /* some free inodes */
8034 /* locks, not used by Linux: */
8035 char s_flock; /* lock during free block list manipulation */
8036 char s_ilock; /* lock during inode cache manipulation */
8037 char s_fmod; /* super-block modified flag */
8038 char s_ronly; /* flag whether fs is mounted read-only */
8039 - u32 s_time __packed2__; /* time of last super block update */
8040 - u32 s_tfree __packed2__; /* total number of free zones */
8041 - u16 s_tinode; /* total number of free inodes */
8042 - u16 s_interleave_m; /* interleave factor */
8043 - u16 s_interleave_n;
8044 + __u32 s_time __packed2__; /* time of last super block update */
8045 + __u32 s_tfree __packed2__; /* total number of free zones */
8046 + __u16 s_tinode; /* total number of free inodes */
8047 + __u16 s_interleave_m; /* interleave factor */
8048 + __u16 s_interleave_n;
8049 char s_fname[6]; /* file system volume name */
8050 char s_fpack[6]; /* file system pack name */
8051 - u32 s_unique; /* zero, not used */
8052 + __u32 s_unique; /* zero, not used */
8053 };
8055 /* SystemV/Coherent inode data on disk */
8056 struct sysv_inode {
8057 - u16 i_mode;
8058 - u16 i_nlink;
8059 - u16 i_uid;
8060 - u16 i_gid;
8061 - u32 i_size;
8062 - u8 i_data[3*(10+1+1+1)];
8063 - u8 i_gen;
8064 - u32 i_atime; /* time of last access */
8065 - u32 i_mtime; /* time of last modification */
8066 - u32 i_ctime; /* time of creation */
8067 + __u16 i_mode;
8068 + __u16 i_nlink;
8069 + __u16 i_uid;
8070 + __u16 i_gid;
8071 + __u32 i_size;
8072 + __u8 i_data[3*(10+1+1+1)];
8073 + __u8 i_gen;
8074 + __u32 i_atime; /* time of last access */
8075 + __u32 i_mtime; /* time of last modification */
8076 + __u32 i_ctime; /* time of creation */
8077 };
8079 /* SystemV/Coherent directory entry on disk */
8080 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/tiocl.h linux-libc-headers-2.6.8.0/include/linux/tiocl.h
8081 --- linux-libc-headers-2.6.8.0-dist/include/linux/tiocl.h 2003-12-15 12:46:58.000000000 -0600
8082 +++ linux-libc-headers-2.6.8.0/include/linux/tiocl.h 2004-08-26 05:42:08.000000000 -0500
8083 @@ -23,7 +23,7 @@
8085 #define TIOCL_SELLOADLUT 5
8086 /* set characters to be considered alphabetic when selecting */
8087 - /* u32[8] bit array, 4 bytes-aligned with type */
8088 + /* __u32[8] bit array, 4 bytes-aligned with type */
8090 /* these two don't return a value: they write it back in the type */
8091 #define TIOCL_GETSHIFTSTATE 6 /* write shift state */
8092 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/umem.h linux-libc-headers-2.6.8.0/include/linux/umem.h
8093 --- linux-libc-headers-2.6.8.0-dist/include/linux/umem.h 2003-12-15 12:46:58.000000000 -0600
8094 +++ linux-libc-headers-2.6.8.0/include/linux/umem.h 2004-08-26 05:42:08.000000000 -0500
8095 @@ -110,19 +110,19 @@
8096 #define DMA_WRITE_TO_HOST 1
8098 struct mm_dma_desc {
8099 - u64 pci_addr;
8100 - u64 local_addr;
8101 - u32 transfer_size;
8102 - u32 zero1;
8103 - u64 next_desc_addr;
8104 - u64 sem_addr;
8105 - u32 control_bits;
8106 - u32 zero2;
8107 + __u64 pci_addr;
8108 + __u64 local_addr;
8109 + __u32 transfer_size;
8110 + __u32 zero1;
8111 + __u64 next_desc_addr;
8112 + __u64 sem_addr;
8113 + __u32 control_bits;
8114 + __u32 zero2;
8116 dma_addr_t data_dma_handle;
8118 /* Copy of the bits */
8119 - u64 sem_control_bits;
8120 + __u64 sem_control_bits;
8121 } __attribute__((aligned(8)));
8123 #define PCI_VENDOR_ID_MICRO_MEMORY 0x1332
8124 diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/vt_buffer.h linux-libc-headers-2.6.8.0/include/linux/vt_buffer.h
8125 --- linux-libc-headers-2.6.8.0-dist/include/linux/vt_buffer.h 2004-01-17 17:04:33.000000000 -0600
8126 +++ linux-libc-headers-2.6.8.0/include/linux/vt_buffer.h 2004-08-26 05:42:08.000000000 -0500
8127 @@ -28,7 +28,7 @@
8128 #endif
8130 #ifndef VT_BUF_HAVE_MEMSETW
8131 -static inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
8132 +static inline void scr_memsetw(__u16 *s, __u16 c, unsigned int count)
8133 {
8134 count /= 2;
8135 while (count--)
8136 @@ -37,7 +37,7 @@
8137 #endif
8139 #ifndef VT_BUF_HAVE_MEMCPYW
8140 -static inline void scr_memcpyw(u16 *d, const u16 *s, unsigned int count)
8141 +static inline void scr_memcpyw(__u16 *d, const __u16 *s, unsigned int count)
8142 {
8143 count /= 2;
8144 while (count--)
8145 @@ -46,7 +46,7 @@
8146 #endif
8148 #ifndef VT_BUF_HAVE_MEMMOVEW
8149 -static inline void scr_memmovew(u16 *d, const u16 *s, unsigned int count)
8150 +static inline void scr_memmovew(__u16 *d, const __u16 *s, unsigned int count)
8151 {
8152 if (d < s)
8153 scr_memcpyw(d, s, count);