NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7430a9bc9c
kumquat-buildroot/toolchain/kernel-headers/linux-libc-headers-2.6.8-cleanup.patch

8154 lines
275 KiB
Diff
Raw Normal View History

Update to what I'm currently using. Lots of changes... 1) Allow selection of binutils/gcc/gdb/kernel headers to build, although some of the older tool patches probably need updating. 2) Rework gdb build so that remote debugging now works with gdbserver. 3) Misc. other package updates.3) Misc. other package updates.3) Misc. other package updates.
2004-09-03 02:49:43 +02:00
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/addrspace.h 2004-03-28 07:51:50.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/addrspace.h 2004-08-26 05:53:12.000000000 -0500
@@ -10,7 +10,23 @@
#ifndef _ASM_ADDRSPACE_H
#define _ASM_ADDRSPACE_H
-#include <spaces.h>
+/**********************************************************************/
+/* Include the common bits for #include <spaces.h> */
+#ifndef __mips64
+
+#define CAC_BASE 0x80000000
+#define IO_BASE 0xa0000000
+#define UNCAC_BASE 0xa0000000
+#define MAP_BASE 0xc0000000
+
+/*
+ * This handles the memory map.
+ * We handle pages at KSEG0 for kernels with 32 bit address space.
+ */
+#define PAGE_OFFSET 0x80000000UL
+
+#endif /* ndef __mips64 */
+/**********************************************************************/
/*
* Configure language
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/asmmacro.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/asmmacro.h 2004-08-26 05:14:41.000000000 -0500
@@ -9,10 +9,10 @@
#define _ASM_ASMMACRO_H
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#include <asm/asmmacro-32.h>
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#include <asm/asmmacro-64.h>
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/checksum.h 2004-06-23 16:52:45.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/checksum.h 2004-08-26 05:14:41.000000000 -0500
@@ -125,7 +125,7 @@
{
__asm__(
".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t"
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
"addu\t%0, %2\n\t"
"sltu\t$1, %0, %2\n\t"
"addu\t%0, $1\n\t"
@@ -138,7 +138,7 @@
"sltu\t$1, %0, %4\n\t"
"addu\t%0, $1\n\t"
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
"daddu\t%0, %2\n\t"
"daddu\t%0, %3\n\t"
"daddu\t%0, %4\n\t"
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/compat.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/compat.h 2004-08-26 05:23:05.000000000 -0500
@@ -8,64 +8,64 @@
#define COMPAT_USER_HZ 100
-typedef u32 compat_size_t;
-typedef s32 compat_ssize_t;
-typedef s32 compat_time_t;
-typedef s32 compat_clock_t;
-typedef s32 compat_suseconds_t;
-
-typedef s32 compat_pid_t;
-typedef s32 compat_uid_t;
-typedef s32 compat_gid_t;
-typedef u32 compat_mode_t;
-typedef u32 compat_ino_t;
-typedef u32 compat_dev_t;
-typedef s32 compat_off_t;
-typedef s64 compat_loff_t;
-typedef u32 compat_nlink_t;
-typedef s32 compat_ipc_pid_t;
-typedef s32 compat_daddr_t;
-typedef s32 compat_caddr_t;
+typedef __u32 compat_size_t;
+typedef __s32 compat_ssize_t;
+typedef __s32 compat_time_t;
+typedef __s32 compat_clock_t;
+typedef __s32 compat_suseconds_t;
+
+typedef __s32 compat_pid_t;
+typedef __s32 compat_uid_t;
+typedef __s32 compat_gid_t;
+typedef __u32 compat_mode_t;
+typedef __u32 compat_ino_t;
+typedef __u32 compat_dev_t;
+typedef __s32 compat_off_t;
+typedef __s64 compat_loff_t;
+typedef __u32 compat_nlink_t;
+typedef __s32 compat_ipc_pid_t;
+typedef __s32 compat_daddr_t;
+typedef __s32 compat_caddr_t;
typedef struct {
- s32 val[2];
+ __s32 val[2];
} compat_fsid_t;
-typedef s32 compat_int_t;
-typedef s32 compat_long_t;
-typedef u32 compat_uint_t;
-typedef u32 compat_ulong_t;
+typedef __s32 compat_int_t;
+typedef __s32 compat_long_t;
+typedef __u32 compat_uint_t;
+typedef __u32 compat_ulong_t;
struct compat_timespec {
compat_time_t tv_sec;
- s32 tv_nsec;
+ __s32 tv_nsec;
};
struct compat_timeval {
compat_time_t tv_sec;
- s32 tv_usec;
+ __s32 tv_usec;
};
struct compat_stat {
compat_dev_t st_dev;
- s32 st_pad1[3];
+ __s32 st_pad1[3];
compat_ino_t st_ino;
compat_mode_t st_mode;
compat_nlink_t st_nlink;
compat_uid_t st_uid;
compat_gid_t st_gid;
compat_dev_t st_rdev;
- s32 st_pad2[2];
+ __s32 st_pad2[2];
compat_off_t st_size;
- s32 st_pad3;
+ __s32 st_pad3;
compat_time_t st_atime;
- s32 st_atime_nsec;
+ __s32 st_atime_nsec;
compat_time_t st_mtime;
- s32 st_mtime_nsec;
+ __s32 st_mtime_nsec;
compat_time_t st_ctime;
- s32 st_ctime_nsec;
- s32 st_blksize;
- s32 st_blocks;
- s32 st_pad4[14];
+ __s32 st_ctime_nsec;
+ __s32 st_blksize;
+ __s32 st_blocks;
+ __s32 st_pad4[14];
};
struct compat_flock {
@@ -73,10 +73,10 @@
short l_whence;
compat_off_t l_start;
compat_off_t l_len;
- s32 l_sysid;
+ __s32 l_sysid;
compat_pid_t l_pid;
short __unused;
- s32 pad[4];
+ __s32 pad[4];
};
#define F_GETLK64 33
@@ -107,12 +107,12 @@
#define COMPAT_RLIM_INFINITY 0x7fffffffUL
-typedef u32 compat_old_sigset_t; /* at least 32 bits */
+typedef __u32 compat_old_sigset_t; /* at least 32 bits */
#define _COMPAT_NSIG 128 /* Don't ask !$@#% ... */
#define _COMPAT_NSIG_BPW 32
-typedef u32 compat_sigset_word;
+typedef __u32 compat_sigset_word;
#define COMPAT_OFF_T_MAX 0x7fffffff
#define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL
@@ -123,7 +123,7 @@
* as pointers because the syscall entry code will have
* appropriately comverted them already.
*/
-typedef u32 compat_uptr_t;
+typedef __u32 compat_uptr_t;
static inline void *compat_ptr(compat_uptr_t uptr)
{
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5074.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5074.h 2004-08-26 13:21:48.000000000 -0500
@@ -34,5 +34,5 @@
extern void ddb5074_led_d2(int on);
extern void ddb5074_led_d3(int on);
-extern void nile4_irq_setup(u32 base);
+extern void nile4_irq_setup(__u32 base);
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5476.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5476.h 2004-08-26 05:24:06.000000000 -0500
@@ -145,13 +145,13 @@
extern void nile4_enable_irq(int nile4_irq);
extern void nile4_disable_irq(int nile4_irq);
extern void nile4_disable_irq_all(void);
-extern u16 nile4_get_irq_stat(int cpu_irq);
+extern __u16 nile4_get_irq_stat(int cpu_irq);
extern void nile4_enable_irq_output(int cpu_irq);
extern void nile4_disable_irq_output(int cpu_irq);
extern void nile4_set_pci_irq_polarity(int pci_irq, int high);
extern void nile4_set_pci_irq_level_or_edge(int pci_irq, int level);
extern void nile4_clear_irq(int nile4_irq);
-extern void nile4_clear_irq_mask(u32 mask);
-extern u8 nile4_i8259_iack(void);
+extern void nile4_clear_irq_mask(__u32 mask);
+extern __u8 nile4_i8259_iack(void);
extern void nile4_dump_irq_status(void); /* Debug */
#endif /* !__ASSEMBLY__ */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5xxx.h 2004-01-17 17:03:47.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5xxx.h 2004-08-26 05:24:01.000000000 -0500
@@ -177,46 +177,46 @@
* interrupt load
*/
#ifndef CONFIG_DDB5074
- volatile u32 *p = (volatile u32 *)0xbfc00000;
+ volatile __u32 *p = (volatile __u32 *)0xbfc00000;
(void)(*p);
#endif
}
-static inline void ddb_out32(u32 offset, u32 val)
+static inline void ddb_out32(__u32 offset, __u32 val)
{
- *(volatile u32 *)(DDB_BASE+offset) = val;
+ *(volatile __u32 *)(DDB_BASE+offset) = val;
ddb_sync();
}
-static inline u32 ddb_in32(u32 offset)
+static inline __u32 ddb_in32(__u32 offset)
{
- u32 val = *(volatile u32 *)(DDB_BASE+offset);
+ __u32 val = *(volatile __u32 *)(DDB_BASE+offset);
ddb_sync();
return val;
}
-static inline void ddb_out16(u32 offset, u16 val)
+static inline void ddb_out16(__u32 offset, __u16 val)
{
- *(volatile u16 *)(DDB_BASE+offset) = val;
+ *(volatile __u16 *)(DDB_BASE+offset) = val;
ddb_sync();
}
-static inline u16 ddb_in16(u32 offset)
+static inline __u16 ddb_in16(__u32 offset)
{
- u16 val = *(volatile u16 *)(DDB_BASE+offset);
+ __u16 val = *(volatile __u16 *)(DDB_BASE+offset);
ddb_sync();
return val;
}
-static inline void ddb_out8(u32 offset, u8 val)
+static inline void ddb_out8(__u32 offset, __u8 val)
{
- *(volatile u8 *)(DDB_BASE+offset) = val;
+ *(volatile __u8 *)(DDB_BASE+offset) = val;
ddb_sync();
}
-static inline u8 ddb_in8(u32 offset)
+static inline __u8 ddb_in8(__u32 offset)
{
- u8 val = *(volatile u8 *)(DDB_BASE+offset);
+ __u8 val = *(volatile __u8 *)(DDB_BASE+offset);
ddb_sync();
return val;
}
@@ -226,10 +226,10 @@
* Physical Device Address Registers
*/
-extern u32
-ddb_calc_pdar(u32 phys, u32 size, int width, int on_memory_bus, int pci_visible);
+extern __u32
+ddb_calc_pdar(__u32 phys, __u32 size, int width, int on_memory_bus, int pci_visible);
extern void
-ddb_set_pdar(u32 pdar, u32 phys, u32 size, int width,
+ddb_set_pdar(__u32 pdar, __u32 phys, __u32 size, int width,
int on_memory_bus, int pci_visible);
/*
@@ -248,7 +248,7 @@
#define DDB_PCI_ACCESS_32 0x10 /* for pci init0/1 regs */
-extern void ddb_set_pmr(u32 pmr, u32 type, u32 addr, u32 options);
+extern void ddb_set_pmr(__u32 pmr, __u32 type, __u32 addr, __u32 options);
/*
* we need to reset pci bus when we start up and shutdown
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/ioasic.h 2004-01-17 17:03:47.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/dec/ioasic.h 2004-08-26 05:25:44.000000000 -0500
@@ -18,14 +18,14 @@
extern spinlock_t ioasic_ssr_lock;
-extern volatile u32 *ioasic_base;
+extern volatile __u32 *ioasic_base;
-static inline void ioasic_write(unsigned int reg, u32 v)
+static inline void ioasic_write(unsigned int reg, __u32 v)
{
ioasic_base[reg / 4] = v;
}
-static inline u32 ioasic_read(unsigned int reg)
+static inline __u32 ioasic_read(unsigned int reg)
{
return ioasic_base[reg / 4];
}
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/kn02.h 2004-01-17 17:03:47.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/dec/kn02.h 2004-08-26 05:25:47.000000000 -0500
@@ -97,7 +97,7 @@
#ifndef __ASSEMBLY__
-extern u32 cached_kn02_csr;
+extern __u32 cached_kn02_csr;
extern spinlock_t kn02_lock;
extern void init_kn02_irqs(int base);
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/elf.h 2004-03-28 07:51:51.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/elf.h 2004-08-26 05:17:25.000000000 -0500
@@ -122,7 +122,7 @@
typedef double elf_fpreg_t;
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
/*
* This is used to ensure we don't load something for the wrong architecture.
@@ -150,9 +150,9 @@
*/
#define ELF_CLASS ELFCLASS32
-#endif /* CONFIG_MIPS32 */
+#endif /* ndef __mips64 */
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
@@ -174,7 +174,7 @@
*/
#define ELF_CLASS ELFCLASS64
-#endif /* CONFIG_MIPS64 */
+#endif /* __mips64 */
/*
* These are used to set parameters in the core dumps.
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/ev96100.h 2004-03-28 07:51:53.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/ev96100.h 2004-08-26 05:23:12.000000000 -0500
@@ -46,9 +46,9 @@
* bytes when running bigendian.
*/
#define __GT_READ(ofs) \
- (*(volatile u32 *)(GT64120_BASE+(ofs)))
+ (*(volatile __u32 *)(GT64120_BASE+(ofs)))
#define __GT_WRITE(ofs, data) \
- do { *(volatile u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
+ do { *(volatile __u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
#define GT_READ(ofs) le32_to_cpu(__GT_READ(ofs))
#define GT_WRITE(ofs, data) __GT_WRITE(ofs, cpu_to_le32(data))
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/gt96100.h 2004-03-28 07:51:53.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/gt96100.h 2004-08-26 05:23:17.000000000 -0500
@@ -27,9 +27,9 @@
#define MIPS_GT96100_BASE (KSEG1ADDR(0x14000000))
#define GT96100_WRITE(ofs, data) \
- *(volatile u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
+ *(volatile __u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
#define GT96100_READ(ofs) \
- le32_to_cpu(*(volatile u32 *)(MIPS_GT96100_BASE+ofs))
+ le32_to_cpu(*(volatile __u32 *)(MIPS_GT96100_BASE+ofs))
#define GT96100_ETH_IO_SIZE 0x4000
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/gt64120.h 2004-03-28 07:51:51.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/gt64120.h 2004-08-26 05:22:36.000000000 -0500
@@ -420,9 +420,9 @@
* bytes when running bigendian. We also provide non-swapping versions.
*/
#define __GT_READ(ofs) \
- (*(volatile u32 *)(GT64120_BASE+(ofs)))
+ (*(volatile __u32 *)(GT64120_BASE+(ofs)))
#define __GT_WRITE(ofs, data) \
- do { *(volatile u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
+ do { *(volatile __u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
#define GT_READ(ofs) le32_to_cpu(__GT_READ(ofs))
#define GT_WRITE(ofs, data) __GT_WRITE(ofs, cpu_to_le32(data))
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/io.h 2004-03-28 07:51:51.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/io.h 2004-08-26 05:24:16.000000000 -0500
@@ -173,14 +173,14 @@
unsigned long flags)
{
if (cpu_has_64bit_addresses) {
- u64 base = UNCAC_BASE;
+ __u64 base = UNCAC_BASE;
/*
* R10000 supports a 2 bit uncached attribute therefore
* UNCAC_BASE may not equal IO_BASE.
*/
if (flags == _CACHE_UNCACHED)
- base = (u64) IO_BASE;
+ base = (__u64) IO_BASE;
return (void *) (unsigned long) (base + offset);
}
@@ -245,10 +245,10 @@
#define __raw_readb(addr) (*(volatile unsigned char *)(addr))
#define __raw_readw(addr) (*(volatile unsigned short *)(addr))
#define __raw_readl(addr) (*(volatile unsigned int *)(addr))
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define ____raw_readq(addr) \
({ \
- u64 __res; \
+ __u64 __res; \
\
__asm__ __volatile__ ( \
" .set mips3 # ____raw_readq \n" \
@@ -263,7 +263,7 @@
#define __raw_readq(addr) \
({ \
unsigned long __flags; \
- u64 __res; \
+ __u64 __res; \
\
local_irq_save(__flags); \
__res = ____raw_readq(addr); \
@@ -271,7 +271,7 @@
__res; \
})
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define ____raw_readq(addr) (*(volatile unsigned long *)(addr))
#define __raw_readq(addr) ____raw_readq(addr)
#endif
@@ -288,10 +288,10 @@
#define __raw_writeb(b,addr) ((*(volatile unsigned char *)(addr)) = (b))
#define __raw_writew(w,addr) ((*(volatile unsigned short *)(addr)) = (w))
#define __raw_writel(l,addr) ((*(volatile unsigned int *)(addr)) = (l))
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define ____raw_writeq(val,addr) \
({ \
- u64 __tmp; \
+ __u64 __tmp; \
\
__asm__ __volatile__ ( \
" .set mips3 \n" \
@@ -313,7 +313,7 @@
local_irq_restore(__flags); \
})
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define ____raw_writeq(q,addr) ((*(volatile unsigned long *)(addr)) = (q))
#define __raw_writeq(q,addr) ____raw_writeq(q, addr)
#endif
@@ -400,28 +400,28 @@
{
port = __swizzle_addr_b(port);
- *(volatile u8 *)(mips_io_port_base + port) = __ioswab8(val);
+ *(volatile __u8 *)(mips_io_port_base + port) = __ioswab8(val);
}
static inline void __outw(unsigned short val, unsigned long port)
{
port = __swizzle_addr_w(port);
- *(volatile u16 *)(mips_io_port_base + port) = __ioswab16(val);
+ *(volatile __u16 *)(mips_io_port_base + port) = __ioswab16(val);
}
static inline void __outl(unsigned int val, unsigned long port)
{
port = __swizzle_addr_l(port);
- *(volatile u32 *)(mips_io_port_base + port) = __ioswab32(val);
+ *(volatile __u32 *)(mips_io_port_base + port) = __ioswab32(val);
}
static inline void __outb_p(unsigned char val, unsigned long port)
{
port = __swizzle_addr_b(port);
- *(volatile u8 *)(mips_io_port_base + port) = __ioswab8(val);
+ *(volatile __u8 *)(mips_io_port_base + port) = __ioswab8(val);
SLOW_DOWN_IO;
}
@@ -429,7 +429,7 @@
{
port = __swizzle_addr_w(port);
- *(volatile u16 *)(mips_io_port_base + port) = __ioswab16(val);
+ *(volatile __u16 *)(mips_io_port_base + port) = __ioswab16(val);
SLOW_DOWN_IO;
}
@@ -437,7 +437,7 @@
{
port = __swizzle_addr_l(port);
- *(volatile u32 *)(mips_io_port_base + port) = __ioswab32(val);
+ *(volatile __u32 *)(mips_io_port_base + port) = __ioswab32(val);
SLOW_DOWN_IO;
}
@@ -452,30 +452,30 @@
{
port = __swizzle_addr_b(port);
- return __ioswab8(*(volatile u8 *)(mips_io_port_base + port));
+ return __ioswab8(*(volatile __u8 *)(mips_io_port_base + port));
}
static inline unsigned short __inw(unsigned long port)
{
port = __swizzle_addr_w(port);
- return __ioswab16(*(volatile u16 *)(mips_io_port_base + port));
+ return __ioswab16(*(volatile __u16 *)(mips_io_port_base + port));
}
static inline unsigned int __inl(unsigned long port)
{
port = __swizzle_addr_l(port);
- return __ioswab32(*(volatile u32 *)(mips_io_port_base + port));
+ return __ioswab32(*(volatile __u32 *)(mips_io_port_base + port));
}
static inline unsigned char __inb_p(unsigned long port)
{
- u8 __val;
+ __u8 __val;
port = __swizzle_addr_b(port);
- __val = *(volatile u8 *)(mips_io_port_base + port);
+ __val = *(volatile __u8 *)(mips_io_port_base + port);
SLOW_DOWN_IO;
return __ioswab8(__val);
@@ -483,11 +483,11 @@
static inline unsigned short __inw_p(unsigned long port)
{
- u16 __val;
+ __u16 __val;
port = __swizzle_addr_w(port);
- __val = *(volatile u16 *)(mips_io_port_base + port);
+ __val = *(volatile __u16 *)(mips_io_port_base + port);
SLOW_DOWN_IO;
return __ioswab16(__val);
@@ -495,11 +495,11 @@
static inline unsigned int __inl_p(unsigned long port)
{
- u32 __val;
+ __u32 __val;
port = __swizzle_addr_l(port);
- __val = *(volatile u32 *)(mips_io_port_base + port);
+ __val = *(volatile __u32 *)(mips_io_port_base + port);
SLOW_DOWN_IO;
return __ioswab32(__val);
@@ -515,7 +515,7 @@
static inline void __outsb(unsigned long port, void *addr, unsigned int count)
{
while (count--) {
- outb(*(u8 *)addr, port);
+ outb(*(__u8 *)addr, port);
addr++;
}
}
@@ -523,7 +523,7 @@
static inline void __insb(unsigned long port, void *addr, unsigned int count)
{
while (count--) {
- *(u8 *)addr = inb(port);
+ *(__u8 *)addr = inb(port);
addr++;
}
}
@@ -531,7 +531,7 @@
static inline void __outsw(unsigned long port, void *addr, unsigned int count)
{
while (count--) {
- outw(*(u16 *)addr, port);
+ outw(*(__u16 *)addr, port);
addr += 2;
}
}
@@ -539,7 +539,7 @@
static inline void __insw(unsigned long port, void *addr, unsigned int count)
{
while (count--) {
- *(u16 *)addr = inw(port);
+ *(__u16 *)addr = inw(port);
addr += 2;
}
}
@@ -547,7 +547,7 @@
static inline void __outsl(unsigned long port, void *addr, unsigned int count)
{
while (count--) {
- outl(*(u32 *)addr, port);
+ outl(*(__u32 *)addr, port);
addr += 4;
}
}
@@ -555,7 +555,7 @@
static inline void __insl(unsigned long port, void *addr, unsigned int count)
{
while (count--) {
- *(u32 *)addr = inl(port);
+ *(__u32 *)addr = inl(port);
addr += 4;
}
}
@@ -617,7 +617,7 @@
#define __CSR_32_ADJUST 0
#endif
-#define csr_out32(v,a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
-#define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
+#define csr_out32(v,a) (*(volatile __u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
+#define csr_in32(a) (*(volatile __u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
#endif /* _ASM_IO_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ip32/mace.h 2004-06-09 07:00:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ip32/mace.h 2004-08-26 05:14:41.000000000 -0500
@@ -22,7 +22,7 @@
#undef BIT
#define BIT(x) (1ULL << (x))
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
typedef struct {
volatile unsigned long long reg;
} mace64_t;
@@ -32,7 +32,7 @@
volatile unsigned long reg;
} mace32_t;
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
typedef struct {
volatile unsigned long reg;
} mace64_t;
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/it8172/it8172.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/it8172/it8172.h 2004-08-26 05:22:54.000000000 -0500
@@ -336,13 +336,13 @@
#define TIMER_TIDR 0x0E
-#define IT_WRITE(ofs, data) *(volatile u32 *)KSEG1ADDR((IT8172_BASE+ofs)) = data
-#define IT_READ(ofs, data) data = *(volatile u32 *)KSEG1ADDR((IT8172_BASE+ofs))
+#define IT_WRITE(ofs, data) *(volatile __u32 *)KSEG1ADDR((IT8172_BASE+ofs)) = data
+#define IT_READ(ofs, data) data = *(volatile __u32 *)KSEG1ADDR((IT8172_BASE+ofs))
-#define IT_IO_WRITE(ofs, data) *(volatile u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
-#define IT_IO_READ(ofs, data) data = *(volatile u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
+#define IT_IO_WRITE(ofs, data) *(volatile __u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
+#define IT_IO_READ(ofs, data) data = *(volatile __u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
-#define IT_IO_WRITE16(ofs, data) *(volatile u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
-#define IT_IO_READ16(ofs, data) data = *(volatile u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
+#define IT_IO_WRITE16(ofs, data) *(volatile __u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
+#define IT_IO_READ16(ofs, data) data = *(volatile __u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/head.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/lasat/head.h 2004-08-26 05:23:42.000000000 -0500
@@ -10,12 +10,12 @@
#ifndef _LANGUAGE_ASSEMBLY
#include <linux/types.h>
struct bootloader_header {
- u32 magic[2];
- u32 version;
- u32 image_start;
- u32 image_size;
- u32 kernel_start;
- u32 kernel_entry;
+ __u32 magic[2];
+ __u32 version;
+ __u32 image_start;
+ __u32 image_size;
+ __u32 kernel_start;
+ __u32 kernel_entry;
};
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/lasat.h 2004-06-09 07:00:42.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/lasat/lasat.h 2004-08-26 05:23:50.000000000 -0500
@@ -25,9 +25,9 @@
#ifndef _LANGUAGE_ASSEMBLY
extern struct lasat_misc {
- volatile u32 *reset_reg;
- volatile u32 *flash_wp_reg;
- u32 flash_wp_bit;
+ volatile __u32 *reset_reg;
+ volatile __u32 *flash_wp_reg;
+ __u32 flash_wp_bit;
} *lasat_misc;
enum lasat_mtdparts {
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/m48t35.h 2004-01-17 17:03:44.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/m48t35.h 2004-08-26 05:23:39.000000000 -0500
@@ -8,15 +8,15 @@
extern spinlock_t rtc_lock;
struct m48t35_rtc {
- volatile u8 pad[0x7ff8]; /* starts at 0x7ff8 */
- volatile u8 control;
- volatile u8 sec;
- volatile u8 min;
- volatile u8 hour;
- volatile u8 day;
- volatile u8 date;
- volatile u8 month;
- volatile u8 year;
+ volatile __u8 pad[0x7ff8]; /* starts at 0x7ff8 */
+ volatile __u8 control;
+ volatile __u8 sec;
+ volatile __u8 min;
+ volatile __u8 hour;
+ volatile __u8 day;
+ volatile __u8 date;
+ volatile __u8 month;
+ volatile __u8 year;
};
#define M48T35_RTC_SET 0x80
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/bonito64.h 2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/bonito64.h 2004-08-26 05:21:59.000000000 -0500
@@ -34,7 +34,7 @@
extern unsigned long _pcictrl_bonito;
extern unsigned long _pcictrl_bonito_pcicfg;
-#define BONITO(x) *(volatile u32 *)(_pcictrl_bonito + (x))
+#define BONITO(x) *(volatile __u32 *)(_pcictrl_bonito + (x))
#endif /* __ASSEMBLY__ */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/generic.h 2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/generic.h 2004-08-26 05:22:06.000000000 -0500
@@ -74,7 +74,7 @@
#define MIPS_REVISION_CORID_CORE_EMUL_BON 0x63
#define MIPS_REVISION_CORID_CORE_EMUL_MSC 0x65
-#define MIPS_REVISION_CORID (((*(volatile u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
+#define MIPS_REVISION_CORID (((*(volatile __u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
extern unsigned int mips_revision_corid;
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/msc01_pci.h 2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/msc01_pci.h 2004-08-26 05:22:10.000000000 -0500
@@ -212,8 +212,8 @@
#define MSC01_PCI_REG_BASE _pcictrl_msc
-#define MSC_WRITE(reg, data) do { *(volatile u32 *)(reg) = data; } while (0)
-#define MSC_READ(reg, data) do { data = *(volatile u32 *)(reg); } while (0)
+#define MSC_WRITE(reg, data) do { *(volatile __u32 *)(reg) = data; } while (0)
+#define MSC_READ(reg, data) do { data = *(volatile __u32 *)(reg); } while (0)
/*
* Registers absolute addresses
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mipsregs.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mipsregs.h 2004-08-26 13:00:51.000000000 -0500
@@ -14,7 +14,6 @@
#define _ASM_MIPSREGS_H
#include <linux/linkage.h>
-#include <asm/hazards.h>
/*
* The following macros are especially useful for __asm__
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mmu_context.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mmu_context.h 2004-08-26 05:14:41.000000000 -0500
@@ -27,12 +27,12 @@
*/
#define TLBMISS_HANDLER_SETUP_PGD(pgd) \
pgd_current[smp_processor_id()] = (unsigned long)(pgd)
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define TLBMISS_HANDLER_SETUP() \
write_c0_context((unsigned long) smp_processor_id() << 23); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define TLBMISS_HANDLER_SETUP() \
write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/module.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/module.h 2004-08-26 05:14:41.000000000 -0500
@@ -21,7 +21,7 @@
Elf64_Sxword r_addend; /* Addend. */
} Elf64_Mips_Rela;
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define Elf_Shdr Elf32_Shdr
#define Elf_Sym Elf32_Sym
@@ -29,7 +29,7 @@
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define Elf_Shdr Elf64_Shdr
#define Elf_Sym Elf64_Sym
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/msgbuf.h 2004-01-17 17:03:44.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/msgbuf.h 2004-08-26 05:15:04.000000000 -0500
@@ -14,25 +14,25 @@
struct msqid64_ds {
struct ipc64_perm msg_perm;
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused1;
#endif
__kernel_time_t msg_stime; /* last msgsnd time */
-#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused1;
#endif
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused2;
#endif
__kernel_time_t msg_rtime; /* last msgrcv time */
-#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused2;
#endif
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused3;
#endif
__kernel_time_t msg_ctime; /* last change time */
-#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
unsigned long __unused3;
#endif
unsigned long msg_cbytes; /* current number of bytes on queue */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/nile4.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/nile4.h 2004-08-26 05:22:46.000000000 -0500
@@ -202,45 +202,45 @@
static inline void nile4_sync(void)
{
- volatile u32 *p = (volatile u32 *)0xbfc00000;
+ volatile __u32 *p = (volatile __u32 *)0xbfc00000;
(void)(*p);
}
-static inline void nile4_out32(u32 offset, u32 val)
+static inline void nile4_out32(__u32 offset, __u32 val)
{
- *(volatile u32 *)(NILE4_BASE+offset) = val;
+ *(volatile __u32 *)(NILE4_BASE+offset) = val;
nile4_sync();
}
-static inline u32 nile4_in32(u32 offset)
+static inline __u32 nile4_in32(__u32 offset)
{
- u32 val = *(volatile u32 *)(NILE4_BASE+offset);
+ __u32 val = *(volatile __u32 *)(NILE4_BASE+offset);
nile4_sync();
return val;
}
-static inline void nile4_out16(u32 offset, u16 val)
+static inline void nile4_out16(__u32 offset, __u16 val)
{
- *(volatile u16 *)(NILE4_BASE+offset) = val;
+ *(volatile __u16 *)(NILE4_BASE+offset) = val;
nile4_sync();
}
-static inline u16 nile4_in16(u32 offset)
+static inline __u16 nile4_in16(__u32 offset)
{
- u16 val = *(volatile u16 *)(NILE4_BASE+offset);
+ __u16 val = *(volatile __u16 *)(NILE4_BASE+offset);
nile4_sync();
return val;
}
-static inline void nile4_out8(u32 offset, u8 val)
+static inline void nile4_out8(__u32 offset, __u8 val)
{
- *(volatile u8 *)(NILE4_BASE+offset) = val;
+ *(volatile __u8 *)(NILE4_BASE+offset) = val;
nile4_sync();
}
-static inline u8 nile4_in8(u32 offset)
+static inline __u8 nile4_in8(__u32 offset)
{
- u8 val = *(volatile u8 *)(NILE4_BASE+offset);
+ __u8 val = *(volatile __u8 *)(NILE4_BASE+offset);
nile4_sync();
return val;
}
@@ -250,7 +250,7 @@
* Physical Device Address Registers
*/
-extern void nile4_set_pdar(u32 pdar, u32 phys, u32 size, int width,
+extern void nile4_set_pdar(__u32 pdar, __u32 phys, __u32 size, int width,
int on_memory_bus, int visible);
@@ -276,7 +276,7 @@
#define NILE4_PCI_IACK_BASE NILE4_PCI_IO_BASE
-extern void nile4_set_pmr(u32 pmr, u32 type, u32 addr);
+extern void nile4_set_pmr(__u32 pmr, __u32 type, __u32 addr);
/*
@@ -296,14 +296,14 @@
extern void nile4_enable_irq(unsigned int nile4_irq);
extern void nile4_disable_irq(unsigned int nile4_irq);
extern void nile4_disable_irq_all(void);
-extern u16 nile4_get_irq_stat(int cpu_irq);
+extern __u16 nile4_get_irq_stat(int cpu_irq);
extern void nile4_enable_irq_output(int cpu_irq);
extern void nile4_disable_irq_output(int cpu_irq);
extern void nile4_set_pci_irq_polarity(int pci_irq, int high);
extern void nile4_set_pci_irq_level_or_edge(int pci_irq, int level);
extern void nile4_clear_irq(int nile4_irq);
-extern void nile4_clear_irq_mask(u32 mask);
-extern u8 nile4_i8259_iack(void);
+extern void nile4_clear_irq_mask(__u32 mask);
+extern __u8 nile4_i8259_iack(void);
extern void nile4_dump_irq_status(void); /* Debug */
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/paccess.h 2004-01-17 17:03:44.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/paccess.h 2004-08-26 05:17:48.000000000 -0500
@@ -14,11 +14,12 @@
#define _ASM_PACCESS_H
#include <linux/errno.h>
+#include <linux/linkage.h>
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define __PA_ADDR ".word"
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define __PA_ADDR ".dword"
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci/bridge.h 2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/pci/bridge.h 2004-08-26 05:25:40.000000000 -0500
@@ -48,9 +48,9 @@
* All accesses to bridge hardware registers must be done
* using 32-bit loads and stores.
*/
-typedef u32 bridgereg_t;
+typedef __u32 bridgereg_t;
-typedef u64 bridge_ate_t;
+typedef __u64 bridge_ate_t;
/* pointers to bridge ATEs
* are always "pointer to volatile"
@@ -199,37 +199,37 @@
/* PCI Device Configuration Spaces 0x020000-0x027FFF */
union { /* make all access sizes available. */
- u8 c[0x1000 / 1];
- u16 s[0x1000 / 2];
- u32 l[0x1000 / 4];
- u64 d[0x1000 / 8];
+ __u8 c[0x1000 / 1];
+ __u16 s[0x1000 / 2];
+ __u32 l[0x1000 / 4];
+ __u64 d[0x1000 / 8];
union {
- u8 c[0x100 / 1];
- u16 s[0x100 / 2];
- u32 l[0x100 / 4];
- u64 d[0x100 / 8];
+ __u8 c[0x100 / 1];
+ __u16 s[0x100 / 2];
+ __u32 l[0x100 / 4];
+ __u64 d[0x100 / 8];
} f[8];
} b_type0_cfg_dev[8]; /* 0x020000 */
/* PCI Type 1 Configuration Space 0x028000-0x028FFF */
union { /* make all access sizes available. */
- u8 c[0x1000 / 1];
- u16 s[0x1000 / 2];
- u32 l[0x1000 / 4];
- u64 d[0x1000 / 8];
+ __u8 c[0x1000 / 1];
+ __u16 s[0x1000 / 2];
+ __u32 l[0x1000 / 4];
+ __u64 d[0x1000 / 8];
} b_type1_cfg; /* 0x028000-0x029000 */
char _pad_029000[0x007000]; /* 0x029000-0x030000 */
/* PCI Interrupt Acknowledge Cycle 0x030000 */
union {
- u8 c[8 / 1];
- u16 s[8 / 2];
- u32 l[8 / 4];
- u64 d[8 / 8];
+ __u8 c[8 / 1];
+ __u16 s[8 / 2];
+ __u32 l[8 / 4];
+ __u64 d[8 / 8];
} b_pci_iack; /* 0x030000 */
- u8 _pad_030007[0x04fff8]; /* 0x030008-0x07FFFF */
+ __u8 _pad_030007[0x04fff8]; /* 0x030008-0x07FFFF */
/* External Address Translation Entry RAM 0x080000-0x0FFFFF */
bridge_ate_t b_ext_ate_ram[0x10000];
@@ -239,10 +239,10 @@
/* PCI/GIO Device Spaces 0x200000-0xBFFFFF */
union { /* make all access sizes available. */
- u8 c[0x100000 / 1];
- u16 s[0x100000 / 2];
- u32 l[0x100000 / 4];
- u64 d[0x100000 / 8];
+ __u8 c[0x100000 / 1];
+ __u16 s[0x100000 / 2];
+ __u32 l[0x100000 / 4];
+ __u64 d[0x100000 / 8];
} b_devio_raw[10]; /* 0x200000 */
/* b_devio macro is a bit strange; it reflects the
@@ -253,10 +253,10 @@
/* External Flash Proms 1,0 0xC00000-0xFFFFFF */
union { /* make all access sizes available. */
- u8 c[0x400000 / 1]; /* read-only */
- u16 s[0x400000 / 2]; /* read-write */
- u32 l[0x400000 / 4]; /* read-only */
- u64 d[0x400000 / 8]; /* read-only */
+ __u8 c[0x400000 / 1]; /* read-only */
+ __u16 s[0x400000 / 2]; /* read-write */
+ __u32 l[0x400000 / 4]; /* read-only */
+ __u64 d[0x400000 / 8]; /* read-only */
} b_external_flash; /* 0xC00000 */
} bridge_t;
@@ -266,9 +266,9 @@
*/
typedef struct bridge_err_cmdword_s {
union {
- u32 cmd_word;
+ __u32 cmd_word;
struct {
- u32 didn:4, /* Destination ID */
+ __u32 didn:4, /* Destination ID */
sidn:4, /* Source ID */
pactyp:4, /* Packet type */
tnum:5, /* Trans Number */
@@ -799,17 +799,17 @@
#ifndef __ASSEMBLY__
/* Address translation entry for mapped pci32 accesses */
typedef union ate_u {
- u64 ent;
+ __u64 ent;
struct ate_s {
- u64 rmf:16;
- u64 addr:36;
- u64 targ:4;
- u64 reserved:3;
- u64 barrier:1;
- u64 prefetch:1;
- u64 precise:1;
- u64 coherent:1;
- u64 valid:1;
+ __u64 rmf:16;
+ __u64 addr:36;
+ __u64 targ:4;
+ __u64 reserved:3;
+ __u64 barrier:1;
+ __u64 prefetch:1;
+ __u64 precise:1;
+ __u64 coherent:1;
+ __u64 valid:1;
} field;
} ate_t;
#endif /* !__ASSEMBLY__ */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci_channel.h 2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/pci_channel.h 2004-08-26 05:21:47.000000000 -0500
@@ -41,6 +41,6 @@
/*
* board supplied pci irq fixup routine
*/
-extern int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
+extern int pcibios_map_irq(struct pci_dev *dev, __u8 slot, __u8 pin);
#endif /* __ASM_PCI_CHANNEL_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pgalloc.h 2004-06-09 07:00:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/pgalloc.h 2004-08-26 05:14:41.000000000 -0500
@@ -85,7 +85,7 @@
#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define pgd_populate(mm, pmd, pte) BUG()
/*
@@ -97,7 +97,7 @@
#define __pmd_free_tlb(tlb,x) do { } while (0)
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define pgd_populate(mm, pgd, pmd) set_pgd(pgd, __pgd(pmd))
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/prctl.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/prctl.h 2004-08-26 05:21:43.000000000 -0500
@@ -12,21 +12,21 @@
#define PRDA ((struct prda *) PRDA_ADDRESS)
struct prda_sys {
- pid_t t_pid;
- u32 t_hint;
- u32 t_dlactseq;
- u32 t_fpflags;
- u32 t_prid; /* processor type, $prid CP0 register */
- u32 t_dlendseq;
- u64 t_unused1[5];
- pid_t t_rpid;
- s32 t_resched;
- u32 t_unused[8];
- u32 t_cpu; /* current/last cpu */
+ pid_t t_pid;
+ __u32 t_hint;
+ __u32 t_dlactseq;
+ __u32 t_fpflags;
+ __u32 t_prid; /* processor type, $prid CP0 register */
+ __u32 t_dlendseq;
+ __u64 t_unused1[5];
+ pid_t t_rpid;
+ __s32 t_resched;
+ __u32 t_unused[8];
+ __u32 t_cpu; /* current/last cpu */
/* FIXME: The signal information, not supported by Linux now */
- u32 t_flags; /* if true, then the sigprocmask is in userspace */
- u32 t_sigprocmask [1]; /* the sigprocmask */
+ __u32 t_flags; /* if true, then the sigprocmask is in userspace */
+ __u32 t_sigprocmask [1]; /* the sigprocmask */
};
struct prda {
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/processor.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/processor.h 2004-08-26 05:23:24.000000000 -0500
@@ -102,7 +102,7 @@
#define MCA_bus 0
#define MCA_bus__is_a_macro /* for versions in ksyms.c */
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
/*
* User space process size: 2GB. This is hardcoded into a few places,
* so don't change it unless you know what you are doing.
@@ -116,7 +116,7 @@
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
/*
* User space process size: 1TB. This is hardcoded into a few places,
* so don't change it unless you know what you are doing. TASK_SIZE
@@ -142,7 +142,7 @@
#define NUM_FPU_REGS 32
-typedef u64 fpureg_t;
+typedef __u64 fpureg_t;
struct mips_fpu_hard_struct {
fpureg_t fpr[NUM_FPU_REGS];
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ptrace.h 2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ptrace.h 2004-08-26 05:14:41.000000000 -0500
@@ -27,7 +27,7 @@
* system call/exception. As usual the registers k0/k1 aren't being saved.
*/
struct pt_regs {
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
/* Pad bytes for argument save space on the stack. */
unsigned long pad0[6];
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/serial.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/serial.h 2004-08-26 13:21:37.000000000 -0500
@@ -68,7 +68,7 @@
#define _JAZZ_SERIAL_INIT(int, base) \
{ .baud_base = JAZZ_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS, \
- .iomem_base = (u8 *) base, .iomem_reg_shift = 0, \
+ .iomem_base = (__u8 *) base, .iomem_reg_shift = 0, \
.io_type = SERIAL_IO_MEM }
#define JAZZ_SERIAL_PORT_DEFNS \
_JAZZ_SERIAL_INIT(JAZZ_SERIAL1_IRQ, JAZZ_SERIAL1_BASE), \
@@ -243,7 +243,7 @@
#define _JAGUAR_ATX_SERIAL_INIT(int, base) \
{ baud_base: JAGUAR_ATX_BASE_BAUD, irq: int, \
flags: (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
- iomem_base: (u8 *) base, iomem_reg_shift: 2, \
+ iomem_base: (__u8 *) base, iomem_reg_shift: 2, \
io_type: SERIAL_IO_MEM }
#define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS \
_JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
@@ -260,7 +260,7 @@
#define _OCELOT_SERIAL_INIT(int, base) \
{ .baud_base = OCELOT_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS, \
- .iomem_base = (u8 *) base, .iomem_reg_shift = 2, \
+ .iomem_base = (__u8 *) base, .iomem_reg_shift = 2, \
.io_type = SERIAL_IO_MEM }
#define MOMENCO_OCELOT_SERIAL_PORT_DEFNS \
_OCELOT_SERIAL_INIT(OCELOT_SERIAL1_IRQ, OCELOT_SERIAL1_BASE)
@@ -281,7 +281,7 @@
#define _OCELOT_G_SERIAL_INIT(int, base) \
{ .baud_base = OCELOT_G_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,\
- .iomem_base = (u8 *) base, .iomem_reg_shift = 2, \
+ .iomem_base = (__u8 *) base, .iomem_reg_shift = 2, \
.io_type = SERIAL_IO_MEM }
#define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS \
_OCELOT_G_SERIAL_INIT(OCELOT_G_SERIAL1_IRQ, OCELOT_G_SERIAL1_BASE)
@@ -303,7 +303,7 @@
{ .baud_base = OCELOT_C_BASE_BAUD, \
.irq = (int), \
.flags = STD_COM_FLAGS, \
- .iomem_base = (u8 *) base, \
+ .iomem_base = (__u8 *) base, \
.iomem_reg_shift = 2, \
.io_type = SERIAL_IO_MEM \
}
@@ -318,10 +318,10 @@
#include <asm/ddb5xxx/ddb5477.h>
#define DDB5477_SERIAL_PORT_DEFNS \
{ .baud_base = BASE_BAUD, .irq = VRC5477_IRQ_UART0, \
- .flags = STD_COM_FLAGS, .iomem_base = (u8*)0xbfa04200, \
+ .flags = STD_COM_FLAGS, .iomem_base = (__u8*)0xbfa04200, \
.iomem_reg_shift = 3, .io_type = SERIAL_IO_MEM}, \
{ .baud_base = BASE_BAUD, .irq = VRC5477_IRQ_UART1, \
- .flags = STD_COM_FLAGS, .iomem_base = (u8*)0xbfa04240, \
+ .flags = STD_COM_FLAGS, .iomem_base = (__u8*)0xbfa04240, \
.iomem_reg_shift = 3, .io_type = SERIAL_IO_MEM},
#else
#define DDB5477_SERIAL_PORT_DEFNS
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/hpc3.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/hpc3.h 2004-08-26 05:24:34.000000000 -0500
@@ -17,8 +17,8 @@
/* An HPC DMA descriptor. */
struct hpc_dma_desc {
- u32 pbuf; /* physical address of data buffer */
- u32 cntinfo; /* counter and info bits */
+ __u32 pbuf; /* physical address of data buffer */
+ __u32 cntinfo; /* counter and info bits */
#define HPCDMA_EOX 0x80000000 /* last desc in chain for tx */
#define HPCDMA_EOR 0x80000000 /* last desc in chain for rx */
#define HPCDMA_EOXP 0x40000000 /* end of packet for tx */
@@ -30,15 +30,15 @@
#define HPCDMA_OWN 0x00004000 /* Denotes ring buffer ownership on rx */
#define HPCDMA_BCNT 0x00003fff /* size in bytes of this dma buffer */
- u32 pnext; /* paddr of next hpc_dma_desc if any */
+ __u32 pnext; /* paddr of next hpc_dma_desc if any */
};
/* The set of regs for each HPC3 PBUS DMA channel. */
struct hpc3_pbus_dmacregs {
- volatile u32 pbdma_bptr; /* pbus dma channel buffer ptr */
- volatile u32 pbdma_dptr; /* pbus dma channel desc ptr */
- u32 _unused0[0x1000/4 - 2]; /* padding */
- volatile u32 pbdma_ctrl; /* pbus dma channel control register has
+ volatile __u32 pbdma_bptr; /* pbus dma channel buffer ptr */
+ volatile __u32 pbdma_dptr; /* pbus dma channel desc ptr */
+ __u32 _unused0[0x1000/4 - 2]; /* padding */
+ volatile __u32 pbdma_ctrl; /* pbus dma channel control register has
* copletely different meaning for read
* compared with write */
/* read */
@@ -55,20 +55,20 @@
#define HPC3_PDMACTRL_FB 0x003f0000 /* Ptr to beginning of fifo */
#define HPC3_PDMACTRL_FE 0x3f000000 /* Ptr to end of fifo */
- u32 _unused1[0x1000/4 - 1]; /* padding */
+ __u32 _unused1[0x1000/4 - 1]; /* padding */
};
/* The HPC3 SCSI registers, this does not include external ones. */
struct hpc3_scsiregs {
- volatile u32 cbptr; /* current dma buffer ptr, diagnostic use only */
- volatile u32 ndptr; /* next dma descriptor ptr */
- u32 _unused0[0x1000/4 - 2]; /* padding */
- volatile u32 bcd; /* byte count info */
+ volatile __u32 cbptr; /* current dma buffer ptr, diagnostic use only */
+ volatile __u32 ndptr; /* next dma descriptor ptr */
+ __u32 _unused0[0x1000/4 - 2]; /* padding */
+ volatile __u32 bcd; /* byte count info */
#define HPC3_SBCD_BCNTMSK 0x00003fff /* bytes to transfer from/to memory */
#define HPC3_SBCD_XIE 0x00004000 /* Send IRQ when done with cur buf */
#define HPC3_SBCD_EOX 0x00008000 /* Indicates this is last buf in chain */
- volatile u32 ctrl; /* control register */
+ volatile __u32 ctrl; /* control register */
#define HPC3_SCTRL_IRQ 0x01 /* IRQ asserted, either dma done or parity */
#define HPC3_SCTRL_ENDIAN 0x02 /* DMA endian mode, 0=big 1=little */
#define HPC3_SCTRL_DIR 0x04 /* DMA direction, 1=dev2mem 0=mem2dev */
@@ -78,9 +78,9 @@
#define HPC3_SCTRL_CRESET 0x40 /* Resets dma channel and external controller */
#define HPC3_SCTRL_PERR 0x80 /* Bad parity on HPC3 iface to scsi controller */
- volatile u32 gfptr; /* current GIO fifo ptr */
- volatile u32 dfptr; /* current device fifo ptr */
- volatile u32 dconfig; /* DMA configuration register */
+ volatile __u32 gfptr; /* current GIO fifo ptr */
+ volatile __u32 dfptr; /* current device fifo ptr */
+ volatile __u32 dconfig; /* DMA configuration register */
#define HPC3_SDCFG_HCLK 0x00001 /* Enable DMA half clock mode */
#define HPC3_SDCFG_D1 0x00006 /* Cycles to spend in D1 state */
#define HPC3_SDCFG_D2 0x00038 /* Cycles to spend in D2 state */
@@ -92,7 +92,7 @@
#define HPC3_SDCFG_POLL 0x08000 /* hd_dreq polarity control */
#define HPC3_SDCFG_ERLY 0x30000 /* hd_dreq behavior control bits */
- volatile u32 pconfig; /* PIO configuration register */
+ volatile __u32 pconfig; /* PIO configuration register */
#define HPC3_SPCFG_P3 0x0003 /* Cycles to spend in P3 state */
#define HPC3_SPCFG_P2W 0x001c /* Cycles to spend in P2 state for writes */
#define HPC3_SPCFG_P2R 0x01e0 /* Cycles to spend in P2 state for reads */
@@ -102,21 +102,21 @@
#define HPC3_SPCFG_EPAR 0x4000 /* Enable parity checking for PIO */
#define HPC3_SPCFG_FUJI 0x8000 /* Fujitsu scsi controller mode for faster dma/pio */
- u32 _unused1[0x1000/4 - 6]; /* padding */
+ __u32 _unused1[0x1000/4 - 6]; /* padding */
};
/* SEEQ ethernet HPC3 registers, only one seeq per HPC3. */
struct hpc3_ethregs {
/* Receiver registers. */
- volatile u32 rx_cbptr; /* current dma buffer ptr, diagnostic use only */
- volatile u32 rx_ndptr; /* next dma descriptor ptr */
- u32 _unused0[0x1000/4 - 2]; /* padding */
- volatile u32 rx_bcd; /* byte count info */
+ volatile __u32 rx_cbptr; /* current dma buffer ptr, diagnostic use only */
+ volatile __u32 rx_ndptr; /* next dma descriptor ptr */
+ __u32 _unused0[0x1000/4 - 2]; /* padding */
+ volatile __u32 rx_bcd; /* byte count info */
#define HPC3_ERXBCD_BCNTMSK 0x00003fff /* bytes to be sent to memory */
#define HPC3_ERXBCD_XIE 0x20000000 /* HPC3 interrupts cpu at end of this buf */
#define HPC3_ERXBCD_EOX 0x80000000 /* flags this as end of descriptor chain */
- volatile u32 rx_ctrl; /* control register */
+ volatile __u32 rx_ctrl; /* control register */
#define HPC3_ERXCTRL_STAT50 0x0000003f /* Receive status reg bits of Seeq8003 */
#define HPC3_ERXCTRL_STAT6 0x00000040 /* Rdonly irq status */
#define HPC3_ERXCTRL_STAT7 0x00000080 /* Rdonlt old/new status bit from Seeq */
@@ -125,15 +125,15 @@
#define HPC3_ERXCTRL_AMASK 0x00000400 /* Tells if ACTIVE inhibits PIO's to hpc3 */
#define HPC3_ERXCTRL_RBO 0x00000800 /* Receive buffer overflow if set to 1 */
- volatile u32 rx_gfptr; /* current GIO fifo ptr */
- volatile u32 rx_dfptr; /* current device fifo ptr */
- u32 _unused1; /* padding */
- volatile u32 rx_reset; /* reset register */
+ volatile __u32 rx_gfptr; /* current GIO fifo ptr */
+ volatile __u32 rx_dfptr; /* current device fifo ptr */
+ __u32 _unused1; /* padding */
+ volatile __u32 rx_reset; /* reset register */
#define HPC3_ERXRST_CRESET 0x1 /* Reset dma channel and external controller */
#define HPC3_ERXRST_CLRIRQ 0x2 /* Clear channel interrupt */
#define HPC3_ERXRST_LBACK 0x4 /* Enable diagnostic loopback mode of Seeq8003 */
- volatile u32 rx_dconfig; /* DMA configuration register */
+ volatile __u32 rx_dconfig; /* DMA configuration register */
#define HPC3_ERXDCFG_D1 0x0000f /* Cycles to spend in D1 state for PIO */
#define HPC3_ERXDCFG_D2 0x000f0 /* Cycles to spend in D2 state for PIO */
#define HPC3_ERXDCFG_D3 0x00f00 /* Cycles to spend in D3 state for PIO */
@@ -143,26 +143,26 @@
#define HPC3_ERXDCFG_FIRQ 0x08000 /* Another bad packet timeout enable */
#define HPC3_ERXDCFG_PTO 0x30000 /* Programmed timeout value for above two */
- volatile u32 rx_pconfig; /* PIO configuration register */
+ volatile __u32 rx_pconfig; /* PIO configuration register */
#define HPC3_ERXPCFG_P1 0x000f /* Cycles to spend in P1 state for PIO */
#define HPC3_ERXPCFG_P2 0x00f0 /* Cycles to spend in P2 state for PIO */
#define HPC3_ERXPCFG_P3 0x0f00 /* Cycles to spend in P3 state for PIO */
#define HPC3_ERXPCFG_TST 0x1000 /* Diagnistic ram test feature bit */
- u32 _unused2[0x1000/4 - 8]; /* padding */
+ __u32 _unused2[0x1000/4 - 8]; /* padding */
/* Transmitter registers. */
- volatile u32 tx_cbptr; /* current dma buffer ptr, diagnostic use only */
- volatile u32 tx_ndptr; /* next dma descriptor ptr */
- u32 _unused3[0x1000/4 - 2]; /* padding */
- volatile u32 tx_bcd; /* byte count info */
+ volatile __u32 tx_cbptr; /* current dma buffer ptr, diagnostic use only */
+ volatile __u32 tx_ndptr; /* next dma descriptor ptr */
+ __u32 _unused3[0x1000/4 - 2]; /* padding */
+ volatile __u32 tx_bcd; /* byte count info */
#define HPC3_ETXBCD_BCNTMSK 0x00003fff /* bytes to be read from memory */
#define HPC3_ETXBCD_ESAMP 0x10000000 /* if set, too late to add descriptor */
#define HPC3_ETXBCD_XIE 0x20000000 /* Interrupt cpu at end of cur desc */
#define HPC3_ETXBCD_EOP 0x40000000 /* Last byte of cur buf is end of packet */
#define HPC3_ETXBCD_EOX 0x80000000 /* This buf is the end of desc chain */
- volatile u32 tx_ctrl; /* control register */
+ volatile __u32 tx_ctrl; /* control register */
#define HPC3_ETXCTRL_STAT30 0x0000000f /* Rdonly copy of seeq tx stat reg */
#define HPC3_ETXCTRL_STAT4 0x00000010 /* Indicate late collision occurred */
#define HPC3_ETXCTRL_STAT75 0x000000e0 /* Rdonly irq status from seeq */
@@ -170,9 +170,9 @@
#define HPC3_ETXCTRL_ACTIVE 0x00000200 /* DMA tx channel is active */
#define HPC3_ETXCTRL_AMASK 0x00000400 /* Indicates ACTIVE inhibits PIO's */
- volatile u32 tx_gfptr; /* current GIO fifo ptr */
- volatile u32 tx_dfptr; /* current device fifo ptr */
- u32 _unused4[0x1000/4 - 4]; /* padding */
+ volatile __u32 tx_gfptr; /* current GIO fifo ptr */
+ volatile __u32 tx_dfptr; /* current device fifo ptr */
+ __u32 _unused4[0x1000/4 - 4]; /* padding */
};
struct hpc3_regs {
@@ -188,7 +188,7 @@
/* Here are where the hpc3 fifo's can be directly accessed
* via PIO accesses. Under normal operation we never stick
* our grubby paws in here so it's just padding. */
- u32 _unused0[0x18000/4];
+ __u32 _unused0[0x18000/4];
/* HPC3 irq status regs. Due to a peculiar bug you need to
* look at two different register addresses to get at all of
@@ -197,42 +197,42 @@
* reliably report bits 9:5 of the hpc3 irq status. I told
* you it was a peculiar bug. ;-)
*/
- volatile u32 istat0; /* Irq status, only bits <4:0> reliable. */
+ volatile __u32 istat0; /* Irq status, only bits <4:0> reliable. */
#define HPC3_ISTAT_PBIMASK 0x0ff /* irq bits for pbus devs 0 --> 7 */
#define HPC3_ISTAT_SC0MASK 0x100 /* irq bit for scsi channel 0 */
#define HPC3_ISTAT_SC1MASK 0x200 /* irq bit for scsi channel 1 */
- volatile u32 gio_misc; /* GIO misc control bits. */
+ volatile __u32 gio_misc; /* GIO misc control bits. */
#define HPC3_GIOMISC_ERTIME 0x1 /* Enable external timer real time. */
#define HPC3_GIOMISC_DENDIAN 0x2 /* dma descriptor endian, 1=lit 0=big */
- volatile u32 eeprom; /* EEPROM data reg. */
+ volatile __u32 eeprom; /* EEPROM data reg. */
#define HPC3_EEPROM_EPROT 0x01 /* Protect register enable */
#define HPC3_EEPROM_CSEL 0x02 /* Chip select */
#define HPC3_EEPROM_ECLK 0x04 /* EEPROM clock */
#define HPC3_EEPROM_DATO 0x08 /* Data out */
#define HPC3_EEPROM_DATI 0x10 /* Data in */
- volatile u32 istat1; /* Irq status, only bits <9:5> reliable. */
- volatile u32 bestat; /* Bus error interrupt status reg. */
+ volatile __u32 istat1; /* Irq status, only bits <9:5> reliable. */
+ volatile __u32 bestat; /* Bus error interrupt status reg. */
#define HPC3_BESTAT_BLMASK 0x000ff /* Bus lane where bad parity occurred */
#define HPC3_BESTAT_CTYPE 0x00100 /* Bus cycle type, 0=PIO 1=DMA */
#define HPC3_BESTAT_PIDSHIFT 9
#define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */
- u32 _unused1[0x14000/4 - 5]; /* padding */
+ __u32 _unused1[0x14000/4 - 5]; /* padding */
/* Now direct PIO per-HPC3 peripheral access to external regs. */
- volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */
- u32 _unused2[0x7c00/4];
- volatile u32 scsi1_ext[256]; /* SCSI channel 1 external regs */
- u32 _unused3[0x7c00/4];
- volatile u32 eth_ext[320]; /* Ethernet external registers */
- u32 _unused4[0x3b00/4];
+ volatile __u32 scsi0_ext[256]; /* SCSI channel 0 external regs */
+ __u32 _unused2[0x7c00/4];
+ volatile __u32 scsi1_ext[256]; /* SCSI channel 1 external regs */
+ __u32 _unused3[0x7c00/4];
+ volatile __u32 eth_ext[320]; /* Ethernet external registers */
+ __u32 _unused4[0x3b00/4];
/* Per-peripheral device external registers and DMA/PIO control. */
- volatile u32 pbus_extregs[16][256];
- volatile u32 pbus_dmacfg[8][128];
+ volatile __u32 pbus_extregs[16][256];
+ volatile __u32 pbus_dmacfg[8][128];
/* Cycles to spend in D3 for reads */
#define HPC3_DMACFG_D3R_MASK 0x00000001
#define HPC3_DMACFG_D3R_SHIFT 0
@@ -262,7 +262,7 @@
#define HPC3_DMACFG_BURST_SHIFT 22
/* Use live pbus_dreq unsynchronized signal */
#define HPC3_DMACFG_DRQLIVE 0x08000000
- volatile u32 pbus_piocfg[16][64];
+ volatile __u32 pbus_piocfg[16][64];
/* Cycles to spend in P2 state for reads */
#define HPC3_PIOCFG_P2R_MASK 0x00001
#define HPC3_PIOCFG_P2R_SHIFT 0
@@ -287,21 +287,21 @@
#define HPC3_PIOCFG_EVENHI 0x80000
/* PBUS PROM control regs. */
- volatile u32 pbus_promwe; /* PROM write enable register */
+ volatile __u32 pbus_promwe; /* PROM write enable register */
#define HPC3_PROM_WENAB 0x1 /* Enable writes to the PROM */
- u32 _unused5[0x0800/4 - 1];
- volatile u32 pbus_promswap; /* Chip select swap reg */
+ __u32 _unused5[0x0800/4 - 1];
+ volatile __u32 pbus_promswap; /* Chip select swap reg */
#define HPC3_PROM_SWAP 0x1 /* invert GIO addr bit to select prom0 or prom1 */
- u32 _unused6[0x0800/4 - 1];
- volatile u32 pbus_gout; /* PROM general purpose output reg */
+ __u32 _unused6[0x0800/4 - 1];
+ volatile __u32 pbus_gout; /* PROM general purpose output reg */
#define HPC3_PROM_STAT 0x1 /* General purpose status bit in gout */
- u32 _unused7[0x1000/4 - 1];
- volatile u32 rtcregs[14]; /* Dallas clock registers */
- u32 _unused8[50];
- volatile u32 bbram[8192-50-14]; /* Battery backed ram */
+ __u32 _unused7[0x1000/4 - 1];
+ volatile __u32 rtcregs[14]; /* Dallas clock registers */
+ __u32 _unused8[50];
+ volatile __u32 bbram[8192-50-14]; /* Battery backed ram */
};
/*
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/ioc.h 2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/ioc.h 2004-08-26 05:24:48.000000000 -0500
@@ -22,26 +22,26 @@
*/
struct sgioc_uart_regs {
- u8 _ctrl1[3];
- volatile u8 ctrl1;
- u8 _data1[3];
- volatile u8 data1;
- u8 _ctrl2[3];
- volatile u8 ctrl2;
- u8 _data2[3];
- volatile u8 data2;
+ __u8 _ctrl1[3];
+ volatile __u8 ctrl1;
+ __u8 _data1[3];
+ volatile __u8 data1;
+ __u8 _ctrl2[3];
+ volatile __u8 ctrl2;
+ __u8 _data2[3];
+ volatile __u8 data2;
};
struct sgioc_keyb_regs {
- u8 _data[3];
- volatile u8 data;
- u8 _command[3];
- volatile u8 command;
+ __u8 _data[3];
+ volatile __u8 data;
+ __u8 _command[3];
+ volatile __u8 command;
};
struct sgint_regs {
- u8 _istat0[3];
- volatile u8 istat0; /* Interrupt status zero */
+ __u8 _istat0[3];
+ volatile __u8 istat0; /* Interrupt status zero */
#define SGINT_ISTAT0_FFULL 0x01
#define SGINT_ISTAT0_SCSI0 0x02
#define SGINT_ISTAT0_SCSI1 0x04
@@ -50,10 +50,10 @@
#define SGINT_ISTAT0_PPORT 0x20
#define SGINT_ISTAT0_HPC2 0x40
#define SGINT_ISTAT0_LIO2 0x80
- u8 _imask0[3];
- volatile u8 imask0; /* Interrupt mask zero */
- u8 _istat1[3];
- volatile u8 istat1; /* Interrupt status one */
+ __u8 _imask0[3];
+ volatile __u8 imask0; /* Interrupt mask zero */
+ __u8 _istat1[3];
+ volatile __u8 istat1; /* Interrupt status one */
#define SGINT_ISTAT1_ISDNI 0x01
#define SGINT_ISTAT1_PWR 0x02
#define SGINT_ISTAT1_ISDNH 0x04
@@ -62,29 +62,29 @@
#define SGINT_ISTAT1_AFAIL 0x20
#define SGINT_ISTAT1_VIDEO 0x40
#define SGINT_ISTAT1_GIO2 0x80
- u8 _imask1[3];
- volatile u8 imask1; /* Interrupt mask one */
- u8 _vmeistat[3];
- volatile u8 vmeistat; /* VME interrupt status */
- u8 _cmeimask0[3];
- volatile u8 cmeimask0; /* VME interrupt mask zero */
- u8 _cmeimask1[3];
- volatile u8 cmeimask1; /* VME interrupt mask one */
- u8 _cmepol[3];
- volatile u8 cmepol; /* VME polarity */
- u8 _tclear[3];
- volatile u8 tclear;
- u8 _errstat[3];
- volatile u8 errstat; /* Error status reg, reserved on INT2 */
- u32 _unused0[2];
- u8 _tcnt0[3];
- volatile u8 tcnt0; /* counter 0 */
- u8 _tcnt1[3];
- volatile u8 tcnt1; /* counter 1 */
- u8 _tcnt2[3];
- volatile u8 tcnt2; /* counter 2 */
- u8 _tcword[3];
- volatile u8 tcword; /* control word */
+ __u8 _imask1[3];
+ volatile __u8 imask1; /* Interrupt mask one */
+ __u8 _vmeistat[3];
+ volatile __u8 vmeistat; /* VME interrupt status */
+ __u8 _cmeimask0[3];
+ volatile __u8 cmeimask0; /* VME interrupt mask zero */
+ __u8 _cmeimask1[3];
+ volatile __u8 cmeimask1; /* VME interrupt mask one */
+ __u8 _cmepol[3];
+ volatile __u8 cmepol; /* VME polarity */
+ __u8 _tclear[3];
+ volatile __u8 tclear;
+ __u8 _errstat[3];
+ volatile __u8 errstat; /* Error status reg, reserved on INT2 */
+ __u32 _unused0[2];
+ __u8 _tcnt0[3];
+ volatile __u8 tcnt0; /* counter 0 */
+ __u8 _tcnt1[3];
+ volatile __u8 tcnt1; /* counter 1 */
+ __u8 _tcnt2[3];
+ volatile __u8 tcnt2; /* counter 2 */
+ __u8 _tcword[3];
+ volatile __u8 tcword; /* control word */
#define SGINT_TCWORD_BCD 0x01 /* Use BCD mode for counters */
#define SGINT_TCWORD_MMASK 0x0e /* Mode bitmask. */
#define SGINT_TCWORD_MITC 0x00 /* IRQ on terminal count (doesn't work) */
@@ -115,55 +115,55 @@
#define SGINT_TCSAMP_COUNTER ((SGINT_TIMER_CLOCK / HZ) + 255)
/* We need software copies of these because they are write only. */
-extern u8 sgi_ioc_reset, sgi_ioc_write;
+extern __u8 sgi_ioc_reset, sgi_ioc_write;
struct sgioc_regs {
struct pi1_regs pport;
- u32 _unused0[2];
+ __u32 _unused0[2];
struct sgioc_uart_regs serport;
struct sgioc_keyb_regs kbdmouse;
- u8 _gcsel[3];
- volatile u8 gcsel;
- u8 _genctrl[3];
- volatile u8 genctrl;
- u8 _panel[3];
- volatile u8 panel;
+ __u8 _gcsel[3];
+ volatile __u8 gcsel;
+ __u8 _genctrl[3];
+ volatile __u8 genctrl;
+ __u8 _panel[3];
+ volatile __u8 panel;
#define SGIOC_PANEL_POWERON 0x01
#define SGIOC_PANEL_POWERINTR 0x02
#define SGIOC_PANEL_VOLDNINTR 0x10
#define SGIOC_PANEL_VOLDNHOLD 0x20
#define SGIOC_PANEL_VOLUPINTR 0x40
#define SGIOC_PANEL_VOLUPHOLD 0x80
- u32 _unused1;
- u8 _sysid[3];
- volatile u8 sysid;
+ __u32 _unused1;
+ __u8 _sysid[3];
+ volatile __u8 sysid;
#define SGIOC_SYSID_FULLHOUSE 0x01
#define SGIOC_SYSID_BOARDREV(x) ((x & 0xe0) > 5)
#define SGIOC_SYSID_CHIPREV(x) ((x & 0x1e) > 1)
- u32 _unused2;
- u8 _read[3];
- volatile u8 read;
- u32 _unused3;
- u8 _dmasel[3];
- volatile u8 dmasel;
+ __u32 _unused2;
+ __u8 _read[3];
+ volatile __u8 read;
+ __u32 _unused3;
+ __u8 _dmasel[3];
+ volatile __u8 dmasel;
#define SGIOC_DMASEL_SCLK10MHZ 0x00 /* use 10MHZ serial clock */
#define SGIOC_DMASEL_ISDNB 0x01 /* enable isdn B */
#define SGIOC_DMASEL_ISDNA 0x02 /* enable isdn A */
#define SGIOC_DMASEL_PPORT 0x04 /* use parallel DMA */
#define SGIOC_DMASEL_SCLK667MHZ 0x10 /* use 6.67MHZ serial clock */
#define SGIOC_DMASEL_SCLKEXT 0x20 /* use external serial clock */
- u32 _unused4;
- u8 _reset[3];
- volatile u8 reset;
+ __u32 _unused4;
+ __u8 _reset[3];
+ volatile __u8 reset;
#define SGIOC_RESET_PPORT 0x01 /* 0=parport reset, 1=nornal */
#define SGIOC_RESET_KBDMOUSE 0x02 /* 0=kbdmouse reset, 1=normal */
#define SGIOC_RESET_EISA 0x04 /* 0=eisa reset, 1=normal */
#define SGIOC_RESET_ISDN 0x08 /* 0=isdn reset, 1=normal */
#define SGIOC_RESET_LC0OFF 0x10 /* guiness: turn led off (red, else green) */
#define SGIOC_RESET_LC1OFF 0x20 /* guiness: turn led off (green, else amber) */
- u32 _unused5;
- u8 _write[3];
- volatile u8 write;
+ __u32 _unused5;
+ __u8 _write[3];
+ volatile __u8 write;
#define SGIOC_WRITE_NTHRESH 0x01 /* use 4.5db threshhold */
#define SGIOC_WRITE_TPSPEED 0x02 /* use 100ohm TP speed */
#define SGIOC_WRITE_EPSEL 0x04 /* force cable mode: 1=AUI 0=TP */
@@ -172,10 +172,10 @@
#define SGIOC_WRITE_U0AMODE 0x20 /* 1=PC 0=MAC UART mode */
#define SGIOC_WRITE_MLO 0x40 /* 1=4.75V 0=+5V */
#define SGIOC_WRITE_MHI 0x80 /* 1=5.25V 0=+5V */
- u32 _unused6;
+ __u32 _unused6;
struct sgint_regs int3;
- u32 _unused7[16];
- volatile u32 extio; /* FullHouse only */
+ __u32 _unused7[16];
+ volatile __u32 extio; /* FullHouse only */
#define EXTIO_S0_IRQ_3 0x8000 /* S0: vid.vsync */
#define EXTIO_S0_IRQ_2 0x4000 /* S0: gfx.fifofull */
#define EXTIO_S0_IRQ_1 0x2000 /* S0: gfx.int */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/mc.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/mc.h 2004-08-26 05:25:28.000000000 -0500
@@ -14,8 +14,8 @@
#define _SGI_MC_H
struct sgimc_regs {
- u32 _unused0;
- volatile u32 cpuctrl0; /* CPU control register 0, readwrite */
+ __u32 _unused0;
+ volatile __u32 cpuctrl0; /* CPU control register 0, readwrite */
#define SGIMC_CCTRL0_REFS 0x0000000f /* REFS mask */
#define SGIMC_CCTRL0_EREFRESH 0x00000010 /* Memory refresh enable */
#define SGIMC_CCTRL0_EPERRGIO 0x00000020 /* GIO parity error enable */
@@ -35,8 +35,8 @@
#define SGIMC_CCTRL0_CMEMBADPAR 0x02000000 /* Generate bad perr from cpu to mem */
#define SGIMC_CCTRL0_R4KNOCHKPARR 0x04000000 /* Don't chk parity on mem data reads */
#define SGIMC_CCTRL0_GIOBTOB 0x08000000 /* Allow GIO back to back writes */
- u32 _unused1;
- volatile u32 cpuctrl1; /* CPU control register 1, readwrite */
+ __u32 _unused1;
+ volatile __u32 cpuctrl1; /* CPU control register 1, readwrite */
#define SGIMC_CCTRL1_EGIOTIMEO 0x00000010 /* GIO bus timeout enable */
#define SGIMC_CCTRL1_FIXEDEHPC 0x00001000 /* Fixed HPC endianness */
#define SGIMC_CCTRL1_LITTLEHPC 0x00002000 /* Little endian HPC */
@@ -45,33 +45,33 @@
#define SGIMC_CCTRL1_FIXEDEEXP1 0x00010000 /* Fixed EXP1 endianness */
#define SGIMC_CCTRL1_LITTLEEXP1 0x00020000 /* Little endian EXP1 */
- u32 _unused2;
- volatile u32 watchdogt; /* Watchdog reg rdonly, write clears */
+ __u32 _unused2;
+ volatile __u32 watchdogt; /* Watchdog reg rdonly, write clears */
- u32 _unused3;
- volatile u32 systemid; /* MC system ID register, readonly */
+ __u32 _unused3;
+ volatile __u32 systemid; /* MC system ID register, readonly */
#define SGIMC_SYSID_MASKREV 0x0000000f /* Revision of MC controller */
#define SGIMC_SYSID_EPRESENT 0x00000010 /* Indicates presence of EISA bus */
- u32 _unused4[3];
- volatile u32 divider; /* Divider reg for RPSS */
+ __u32 _unused4[3];
+ volatile __u32 divider; /* Divider reg for RPSS */
- u32 _unused5;
- volatile u32 eeprom; /* EEPROM byte reg for r4k */
+ __u32 _unused5;
+ volatile __u32 eeprom; /* EEPROM byte reg for r4k */
#define SGIMC_EEPROM_PRE 0x00000001 /* eeprom chip PRE pin assertion */
#define SGIMC_EEPROM_CSEL 0x00000002 /* Active high, eeprom chip select */
#define SGIMC_EEPROM_SECLOCK 0x00000004 /* EEPROM serial clock */
#define SGIMC_EEPROM_SDATAO 0x00000008 /* Serial EEPROM data-out */
#define SGIMC_EEPROM_SDATAI 0x00000010 /* Serial EEPROM data-in */
- u32 _unused6[3];
- volatile u32 rcntpre; /* Preload refresh counter */
+ __u32 _unused6[3];
+ volatile __u32 rcntpre; /* Preload refresh counter */
- u32 _unused7;
- volatile u32 rcounter; /* Readonly refresh counter */
+ __u32 _unused7;
+ volatile __u32 rcounter; /* Readonly refresh counter */
- u32 _unused8[13];
- volatile u32 giopar; /* Parameter word for GIO64 */
+ __u32 _unused8[13];
+ volatile __u32 giopar; /* Parameter word for GIO64 */
#define SGIMC_GIOPAR_HPC64 0x00000001 /* HPC talks to GIO using 64-bits */
#define SGIMC_GIOPAR_GFX64 0x00000002 /* GFX talks to GIO using 64-bits */
#define SGIMC_GIOPAR_EXP064 0x00000004 /* EXP(slot0) talks using 64-bits */
@@ -89,36 +89,36 @@
#define SGIMC_GIOPAR_PLINEEXP0 0x00004000 /* EXP(slot0) has pipeline attr */
#define SGIMC_GIOPAR_PLINEEXP1 0x00008000 /* EXP(slot1) has pipeline attr */
- u32 _unused9;
- volatile u32 cputp; /* CPU bus arb time period */
+ __u32 _unused9;
+ volatile __u32 cputp; /* CPU bus arb time period */
- u32 _unused10[3];
- volatile u32 lbursttp; /* Time period for long bursts */
+ __u32 _unused10[3];
+ volatile __u32 lbursttp; /* Time period for long bursts */
/* MC chip can drive up to 4 bank 4 SIMMs each. All SIMMs in bank must
* be the same size. The size encoding for supported SIMMs is bellow */
- u32 _unused11[9];
- volatile u32 mconfig0; /* Memory config register zero */
- u32 _unused12;
- volatile u32 mconfig1; /* Memory config register one */
+ __u32 _unused11[9];
+ volatile __u32 mconfig0; /* Memory config register zero */
+ __u32 _unused12;
+ volatile __u32 mconfig1; /* Memory config register one */
#define SGIMC_MCONFIG_BASEADDR 0x000000ff /* Base address of bank*/
#define SGIMC_MCONFIG_RMASK 0x00001f00 /* Ram config bitmask */
#define SGIMC_MCONFIG_BVALID 0x00002000 /* Bank is valid */
#define SGIMC_MCONFIG_SBANKS 0x00004000 /* Number of subbanks */
- u32 _unused13;
- volatile u32 cmacc; /* Mem access config for CPU */
- u32 _unused14;
- volatile u32 gmacc; /* Mem access config for GIO */
+ __u32 _unused13;
+ volatile __u32 cmacc; /* Mem access config for CPU */
+ __u32 _unused14;
+ volatile __u32 gmacc; /* Mem access config for GIO */
/* This define applies to both cmacc and gmacc registers above. */
#define SGIMC_MACC_ALIASBIG 0x20000000 /* 512MB home for alias */
/* Error address/status regs from GIO and CPU perspectives. */
- u32 _unused15;
- volatile u32 cerr; /* Error address reg for CPU */
- u32 _unused16;
- volatile u32 cstat; /* Status reg for CPU */
+ __u32 _unused15;
+ volatile __u32 cerr; /* Error address reg for CPU */
+ __u32 _unused16;
+ volatile __u32 cstat; /* Status reg for CPU */
#define SGIMC_CSTAT_RD 0x00000100 /* read parity error */
#define SGIMC_CSTAT_PAR 0x00000200 /* CPU parity error */
#define SGIMC_CSTAT_ADDR 0x00000400 /* memory bus error bad addr */
@@ -128,10 +128,10 @@
#define SGIMC_CSTAT_PAR_MASK 0x00001f00 /* parity error mask */
#define SGIMC_CSTAT_RD_PAR (SGIMC_CSTAT_RD | SGIMC_CSTAT_PAR)
- u32 _unused17;
- volatile u32 gerr; /* Error address reg for GIO */
- u32 _unused18;
- volatile u32 gstat; /* Status reg for GIO */
+ __u32 _unused17;
+ volatile __u32 gerr; /* Error address reg for GIO */
+ __u32 _unused18;
+ volatile __u32 gstat; /* Status reg for GIO */
#define SGIMC_GSTAT_RD 0x00000100 /* read parity error */
#define SGIMC_GSTAT_WR 0x00000200 /* write parity error */
#define SGIMC_GSTAT_TIME 0x00000400 /* GIO bus timed out */
@@ -142,76 +142,76 @@
#define SGIMC_GSTAT_PIO_WR 0x00008000 /* write data parity on pio */
/* Special hard bus locking registers. */
- u32 _unused19;
- volatile u32 syssembit; /* Uni-bit system semaphore */
- u32 _unused20;
- volatile u32 mlock; /* Global GIO memory access lock */
- u32 _unused21;
- volatile u32 elock; /* Locks EISA from GIO accesses */
+ __u32 _unused19;
+ volatile __u32 syssembit; /* Uni-bit system semaphore */
+ __u32 _unused20;
+ volatile __u32 mlock; /* Global GIO memory access lock */
+ __u32 _unused21;
+ volatile __u32 elock; /* Locks EISA from GIO accesses */
/* GIO dma control registers. */
- u32 _unused22[15];
- volatile u32 gio_dma_trans; /* DMA mask to translation GIO addrs */
- u32 _unused23;
- volatile u32 gio_dma_sbits; /* DMA GIO addr substitution bits */
- u32 _unused24;
- volatile u32 dma_intr_cause; /* DMA IRQ cause indicator bits */
- u32 _unused25;
- volatile u32 dma_ctrl; /* Main DMA control reg */
+ __u32 _unused22[15];
+ volatile __u32 gio_dma_trans; /* DMA mask to translation GIO addrs */
+ __u32 _unused23;
+ volatile __u32 gio_dma_sbits; /* DMA GIO addr substitution bits */
+ __u32 _unused24;
+ volatile __u32 dma_intr_cause; /* DMA IRQ cause indicator bits */
+ __u32 _unused25;
+ volatile __u32 dma_ctrl; /* Main DMA control reg */
/* DMA TLB entry 0 */
- u32 _unused26[5];
- volatile u32 dtlb_hi0;
- u32 _unused27;
- volatile u32 dtlb_lo0;
+ __u32 _unused26[5];
+ volatile __u32 dtlb_hi0;
+ __u32 _unused27;
+ volatile __u32 dtlb_lo0;
/* DMA TLB entry 1 */
- u32 _unused28;
- volatile u32 dtlb_hi1;
- u32 _unused29;
- volatile u32 dtlb_lo1;
+ __u32 _unused28;
+ volatile __u32 dtlb_hi1;
+ __u32 _unused29;
+ volatile __u32 dtlb_lo1;
/* DMA TLB entry 2 */
- u32 _unused30;
- volatile u32 dtlb_hi2;
- u32 _unused31;
- volatile u32 dtlb_lo2;
+ __u32 _unused30;
+ volatile __u32 dtlb_hi2;
+ __u32 _unused31;
+ volatile __u32 dtlb_lo2;
/* DMA TLB entry 3 */
- u32 _unused32;
- volatile u32 dtlb_hi3;
- u32 _unused33;
- volatile u32 dtlb_lo3;
+ __u32 _unused32;
+ volatile __u32 dtlb_hi3;
+ __u32 _unused33;
+ volatile __u32 dtlb_lo3;
- u32 _unused34[0x0392];
+ __u32 _unused34[0x0392];
- u32 _unused35;
- volatile u32 rpsscounter; /* Chirps at 100ns */
+ __u32 _unused35;
+ volatile __u32 rpsscounter; /* Chirps at 100ns */
- u32 _unused36[0x1000/4-2*4];
+ __u32 _unused36[0x1000/4-2*4];
- u32 _unused37;
- volatile u32 maddronly; /* Address DMA goes at */
- u32 _unused38;
- volatile u32 maddrpdeflts; /* Same as above, plus set defaults */
- u32 _unused39;
- volatile u32 dmasz; /* DMA count */
- u32 _unused40;
- volatile u32 ssize; /* DMA stride size */
- u32 _unused41;
- volatile u32 gmaddronly; /* Set GIO DMA but don't start trans */
- u32 _unused42;
- volatile u32 dmaddnpgo; /* Set GIO DMA addr + start transfer */
- u32 _unused43;
- volatile u32 dmamode; /* DMA mode config bit settings */
- u32 _unused44;
- volatile u32 dmaccount; /* Zoom and byte count for DMA */
- u32 _unused45;
- volatile u32 dmastart; /* Pedal to the metal. */
- u32 _unused46;
- volatile u32 dmarunning; /* DMA op is in progress */
- u32 _unused47;
- volatile u32 maddrdefstart; /* Set dma addr, defaults, and kick it */
+ __u32 _unused37;
+ volatile __u32 maddronly; /* Address DMA goes at */
+ __u32 _unused38;
+ volatile __u32 maddrpdeflts; /* Same as above, plus set defaults */
+ __u32 _unused39;
+ volatile __u32 dmasz; /* DMA count */
+ __u32 _unused40;
+ volatile __u32 ssize; /* DMA stride size */
+ __u32 _unused41;
+ volatile __u32 gmaddronly; /* Set GIO DMA but don't start trans */
+ __u32 _unused42;
+ volatile __u32 dmaddnpgo; /* Set GIO DMA addr + start transfer */
+ __u32 _unused43;
+ volatile __u32 dmamode; /* DMA mode config bit settings */
+ __u32 _unused44;
+ volatile __u32 dmaccount; /* Zoom and byte count for DMA */
+ __u32 _unused45;
+ volatile __u32 dmastart; /* Pedal to the metal. */
+ __u32 _unused46;
+ volatile __u32 dmarunning; /* DMA op is in progress */
+ __u32 _unused47;
+ volatile __u32 maddrdefstart; /* Set dma addr, defaults, and kick it */
};
extern struct sgimc_regs *sgimc;
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgiarcs.h 2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgiarcs.h 2004-08-26 05:21:53.000000000 -0500
@@ -164,11 +164,11 @@
/* This prom has a bolixed design. */
struct linux_bigint {
#ifdef __MIPSEL__
- u32 lo;
- s32 hi;
+ __u32 lo;
+ __s32 hi;
#else /* !(__MIPSEL__) */
- s32 hi;
- u32 lo;
+ __s32 hi;
+ __u32 lo;
#endif
};
@@ -366,7 +366,7 @@
* Macros for calling a 32-bit ARC implementation from 64-bit code
*/
-#if defined(CONFIG_MIPS64) && defined(CONFIG_ARC32)
+#if defined(__mips64) && defined(CONFIG_ARC32)
#define __arc_clobbers \
"$2","$3" /* ... */, "$8","$9","$10","$11", \
@@ -475,10 +475,10 @@
__res; \
})
-#endif /* defined(CONFIG_MIPS64) && defined(CONFIG_ARC32) */
+#endif /* defined(__mips64) && defined(CONFIG_ARC32) */
-#if (defined(CONFIG_MIPS32) && defined(CONFIG_ARC32)) || \
- (defined(CONFIG_MIPS64) && defined(CONFIG_ARC64))
+#if (!defined(__mips64) && defined(CONFIG_ARC32)) || \
+ (defined(__mips64) && defined(CONFIG_ARC64))
#define ARC_CALL0(dest) \
({ long __res; \
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/siginfo.h 2004-06-09 07:00:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/siginfo.h 2004-08-26 05:14:41.000000000 -0500
@@ -66,10 +66,10 @@
/* SIGPOLL, SIGXFSZ (To do ...) */
struct {
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
long _band; /* POLL_IN, POLL_OUT, POLL_MSG */
#endif
int _fd;
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sim.h 2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sim.h 2004-08-26 05:17:16.000000000 -0500
@@ -18,7 +18,7 @@
#define __str2(x) #x
#define __str(x) __str2(x)
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
#define save_static_function(symbol) \
__asm__ ( \
@@ -43,9 +43,9 @@
#define nabi_no_regargs
-#endif /* CONFIG_MIPS32 */
+#endif /* ndef __mips64 */
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
#define save_static_function(symbol) \
__asm__ ( \
@@ -78,6 +78,6 @@
unsigned long __dummy6, \
unsigned long __dummy7,
-#endif /* CONFIG_MIPS64 */
+#endif /* __mips64 */
#endif /* _ASM_SIM_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/arch.h 2004-06-09 07:00:42.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/arch.h 2004-08-26 05:26:16.000000000 -0500
@@ -17,8 +17,8 @@
#include <asm/sn/sn0/arch.h>
#endif
-typedef u64 hubreg_t;
-typedef u64 nic_t;
+typedef __u64 hubreg_t;
+typedef __u64 nic_t;
#define cputonasid(cpu) (cpu_data[(cpu)].p_nasid)
#define cputoslice(cpu) (cpu_data[(cpu)].p_slice)
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/gda.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/gda.h 2004-08-26 05:26:30.000000000 -0500
@@ -44,11 +44,11 @@
#ifndef __ASSEMBLY__
typedef struct gda {
- u32 g_magic; /* GDA magic number */
- u16 g_version; /* Version of this structure */
- u16 g_masterid; /* The NASID:CPUNUM of the master cpu */
- u32 g_promop; /* Passes requests from the kernel to prom */
- u32 g_vds; /* Store the virtual dipswitches here */
+ __u32 g_magic; /* GDA magic number */
+ __u16 g_version; /* Version of this structure */
+ __u16 g_masterid; /* The NASID:CPUNUM of the master cpu */
+ __u32 g_promop; /* Passes requests from the kernel to prom */
+ __u32 g_vds; /* Store the virtual dipswitches here */
void **g_hooked_norm;/* ptr to pda loc for norm hndlr */
void **g_hooked_utlb;/* ptr to pda loc for utlb hndlr */
void **g_hooked_xtlb;/* ptr to pda loc for xtlb hndlr */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/ioc3.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/ioc3.h 2004-08-26 05:26:06.000000000 -0500
@@ -8,23 +8,23 @@
/* SUPERIO uart register map */
typedef volatile struct ioc3_uartregs {
union {
- volatile u8 rbr; /* read only, DLAB == 0 */
- volatile u8 thr; /* write only, DLAB == 0 */
- volatile u8 dll; /* DLAB == 1 */
+ volatile __u8 rbr; /* read only, DLAB == 0 */
+ volatile __u8 thr; /* write only, DLAB == 0 */
+ volatile __u8 dll; /* DLAB == 1 */
} u1;
union {
- volatile u8 ier; /* DLAB == 0 */
- volatile u8 dlm; /* DLAB == 1 */
+ volatile __u8 ier; /* DLAB == 0 */
+ volatile __u8 dlm; /* DLAB == 1 */
} u2;
union {
- volatile u8 iir; /* read only */
- volatile u8 fcr; /* write only */
+ volatile __u8 iir; /* read only */
+ volatile __u8 fcr; /* write only */
} u3;
- volatile u8 iu_lcr;
- volatile u8 iu_mcr;
- volatile u8 iu_lsr;
- volatile u8 iu_msr;
- volatile u8 iu_scr;
+ volatile __u8 iu_lcr;
+ volatile __u8 iu_mcr;
+ volatile __u8 iu_lsr;
+ volatile __u8 iu_msr;
+ volatile __u8 iu_scr;
} ioc3_uregs_t;
#define iu_rbr u1.rbr
@@ -36,29 +36,29 @@
#define iu_fcr u3.fcr
struct ioc3_sioregs {
- volatile u8 fill[0x141]; /* starts at 0x141 */
+ volatile __u8 fill[0x141]; /* starts at 0x141 */
- volatile u8 uartc;
- volatile u8 kbdcg;
+ volatile __u8 uartc;
+ volatile __u8 kbdcg;
- volatile u8 fill0[0x150 - 0x142 - 1];
+ volatile __u8 fill0[0x150 - 0x142 - 1];
- volatile u8 pp_data;
- volatile u8 pp_dsr;
- volatile u8 pp_dcr;
+ volatile __u8 pp_data;
+ volatile __u8 pp_dsr;
+ volatile __u8 pp_dcr;
- volatile u8 fill1[0x158 - 0x152 - 1];
+ volatile __u8 fill1[0x158 - 0x152 - 1];
- volatile u8 pp_fifa;
- volatile u8 pp_cfgb;
- volatile u8 pp_ecr;
+ volatile __u8 pp_fifa;
+ volatile __u8 pp_cfgb;
+ volatile __u8 pp_ecr;
- volatile u8 fill2[0x168 - 0x15a - 1];
+ volatile __u8 fill2[0x168 - 0x15a - 1];
- volatile u8 rtcad;
- volatile u8 rtcdat;
+ volatile __u8 rtcad;
+ volatile __u8 rtcdat;
- volatile u8 fill3[0x170 - 0x169 - 1];
+ volatile __u8 fill3[0x170 - 0x169 - 1];
struct ioc3_uartregs uartb; /* 0x20170 */
struct ioc3_uartregs uarta; /* 0x20178 */
@@ -66,103 +66,103 @@
/* Register layout of IOC3 in configuration space. */
struct ioc3 {
- volatile u32 pad0[7]; /* 0x00000 */
- volatile u32 sio_ir; /* 0x0001c */
- volatile u32 sio_ies; /* 0x00020 */
- volatile u32 sio_iec; /* 0x00024 */
- volatile u32 sio_cr; /* 0x00028 */
- volatile u32 int_out; /* 0x0002c */
- volatile u32 mcr; /* 0x00030 */
+ volatile __u32 pad0[7]; /* 0x00000 */
+ volatile __u32 sio_ir; /* 0x0001c */
+ volatile __u32 sio_ies; /* 0x00020 */
+ volatile __u32 sio_iec; /* 0x00024 */
+ volatile __u32 sio_cr; /* 0x00028 */
+ volatile __u32 int_out; /* 0x0002c */
+ volatile __u32 mcr; /* 0x00030 */
/* General Purpose I/O registers */
- volatile u32 gpcr_s; /* 0x00034 */
- volatile u32 gpcr_c; /* 0x00038 */
- volatile u32 gpdr; /* 0x0003c */
- volatile u32 gppr_0; /* 0x00040 */
- volatile u32 gppr_1; /* 0x00044 */
- volatile u32 gppr_2; /* 0x00048 */
- volatile u32 gppr_3; /* 0x0004c */
- volatile u32 gppr_4; /* 0x00050 */
- volatile u32 gppr_5; /* 0x00054 */
- volatile u32 gppr_6; /* 0x00058 */
- volatile u32 gppr_7; /* 0x0005c */
- volatile u32 gppr_8; /* 0x00060 */
- volatile u32 gppr_9; /* 0x00064 */
- volatile u32 gppr_10; /* 0x00068 */
- volatile u32 gppr_11; /* 0x0006c */
- volatile u32 gppr_12; /* 0x00070 */
- volatile u32 gppr_13; /* 0x00074 */
- volatile u32 gppr_14; /* 0x00078 */
- volatile u32 gppr_15; /* 0x0007c */
+ volatile __u32 gpcr_s; /* 0x00034 */
+ volatile __u32 gpcr_c; /* 0x00038 */
+ volatile __u32 gpdr; /* 0x0003c */
+ volatile __u32 gppr_0; /* 0x00040 */
+ volatile __u32 gppr_1; /* 0x00044 */
+ volatile __u32 gppr_2; /* 0x00048 */
+ volatile __u32 gppr_3; /* 0x0004c */
+ volatile __u32 gppr_4; /* 0x00050 */
+ volatile __u32 gppr_5; /* 0x00054 */
+ volatile __u32 gppr_6; /* 0x00058 */
+ volatile __u32 gppr_7; /* 0x0005c */
+ volatile __u32 gppr_8; /* 0x00060 */
+ volatile __u32 gppr_9; /* 0x00064 */
+ volatile __u32 gppr_10; /* 0x00068 */
+ volatile __u32 gppr_11; /* 0x0006c */
+ volatile __u32 gppr_12; /* 0x00070 */
+ volatile __u32 gppr_13; /* 0x00074 */
+ volatile __u32 gppr_14; /* 0x00078 */
+ volatile __u32 gppr_15; /* 0x0007c */
/* Parallel Port Registers */
- volatile u32 ppbr_h_a; /* 0x00080 */
- volatile u32 ppbr_l_a; /* 0x00084 */
- volatile u32 ppcr_a; /* 0x00088 */
- volatile u32 ppcr; /* 0x0008c */
- volatile u32 ppbr_h_b; /* 0x00090 */
- volatile u32 ppbr_l_b; /* 0x00094 */
- volatile u32 ppcr_b; /* 0x00098 */
+ volatile __u32 ppbr_h_a; /* 0x00080 */
+ volatile __u32 ppbr_l_a; /* 0x00084 */
+ volatile __u32 ppcr_a; /* 0x00088 */
+ volatile __u32 ppcr; /* 0x0008c */
+ volatile __u32 ppbr_h_b; /* 0x00090 */
+ volatile __u32 ppbr_l_b; /* 0x00094 */
+ volatile __u32 ppcr_b; /* 0x00098 */
/* Keyboard and Mouse Registers */
- volatile u32 km_csr; /* 0x0009c */
- volatile u32 k_rd; /* 0x000a0 */
- volatile u32 m_rd; /* 0x000a4 */
- volatile u32 k_wd; /* 0x000a8 */
- volatile u32 m_wd; /* 0x000ac */
+ volatile __u32 km_csr; /* 0x0009c */
+ volatile __u32 k_rd; /* 0x000a0 */
+ volatile __u32 m_rd; /* 0x000a4 */
+ volatile __u32 k_wd; /* 0x000a8 */
+ volatile __u32 m_wd; /* 0x000ac */
/* Serial Port Registers */
- volatile u32 sbbr_h; /* 0x000b0 */
- volatile u32 sbbr_l; /* 0x000b4 */
- volatile u32 sscr_a; /* 0x000b8 */
- volatile u32 stpir_a; /* 0x000bc */
- volatile u32 stcir_a; /* 0x000c0 */
- volatile u32 srpir_a; /* 0x000c4 */
- volatile u32 srcir_a; /* 0x000c8 */
- volatile u32 srtr_a; /* 0x000cc */
- volatile u32 shadow_a; /* 0x000d0 */
- volatile u32 sscr_b; /* 0x000d4 */
- volatile u32 stpir_b; /* 0x000d8 */
- volatile u32 stcir_b; /* 0x000dc */
- volatile u32 srpir_b; /* 0x000e0 */
- volatile u32 srcir_b; /* 0x000e4 */
- volatile u32 srtr_b; /* 0x000e8 */
- volatile u32 shadow_b; /* 0x000ec */
+ volatile __u32 sbbr_h; /* 0x000b0 */
+ volatile __u32 sbbr_l; /* 0x000b4 */
+ volatile __u32 sscr_a; /* 0x000b8 */
+ volatile __u32 stpir_a; /* 0x000bc */
+ volatile __u32 stcir_a; /* 0x000c0 */
+ volatile __u32 srpir_a; /* 0x000c4 */
+ volatile __u32 srcir_a; /* 0x000c8 */
+ volatile __u32 srtr_a; /* 0x000cc */
+ volatile __u32 shadow_a; /* 0x000d0 */
+ volatile __u32 sscr_b; /* 0x000d4 */
+ volatile __u32 stpir_b; /* 0x000d8 */
+ volatile __u32 stcir_b; /* 0x000dc */
+ volatile __u32 srpir_b; /* 0x000e0 */
+ volatile __u32 srcir_b; /* 0x000e4 */
+ volatile __u32 srtr_b; /* 0x000e8 */
+ volatile __u32 shadow_b; /* 0x000ec */
/* Ethernet Registers */
- volatile u32 emcr; /* 0x000f0 */
- volatile u32 eisr; /* 0x000f4 */
- volatile u32 eier; /* 0x000f8 */
- volatile u32 ercsr; /* 0x000fc */
- volatile u32 erbr_h; /* 0x00100 */
- volatile u32 erbr_l; /* 0x00104 */
- volatile u32 erbar; /* 0x00108 */
- volatile u32 ercir; /* 0x0010c */
- volatile u32 erpir; /* 0x00110 */
- volatile u32 ertr; /* 0x00114 */
- volatile u32 etcsr; /* 0x00118 */
- volatile u32 ersr; /* 0x0011c */
- volatile u32 etcdc; /* 0x00120 */
- volatile u32 ebir; /* 0x00124 */
- volatile u32 etbr_h; /* 0x00128 */
- volatile u32 etbr_l; /* 0x0012c */
- volatile u32 etcir; /* 0x00130 */
- volatile u32 etpir; /* 0x00134 */
- volatile u32 emar_h; /* 0x00138 */
- volatile u32 emar_l; /* 0x0013c */
- volatile u32 ehar_h; /* 0x00140 */
- volatile u32 ehar_l; /* 0x00144 */
- volatile u32 micr; /* 0x00148 */
- volatile u32 midr_r; /* 0x0014c */
- volatile u32 midr_w; /* 0x00150 */
- volatile u32 pad1[(0x20000 - 0x00154) / 4];
+ volatile __u32 emcr; /* 0x000f0 */
+ volatile __u32 eisr; /* 0x000f4 */
+ volatile __u32 eier; /* 0x000f8 */
+ volatile __u32 ercsr; /* 0x000fc */
+ volatile __u32 erbr_h; /* 0x00100 */
+ volatile __u32 erbr_l; /* 0x00104 */
+ volatile __u32 erbar; /* 0x00108 */
+ volatile __u32 ercir; /* 0x0010c */
+ volatile __u32 erpir; /* 0x00110 */
+ volatile __u32 ertr; /* 0x00114 */
+ volatile __u32 etcsr; /* 0x00118 */
+ volatile __u32 ersr; /* 0x0011c */
+ volatile __u32 etcdc; /* 0x00120 */
+ volatile __u32 ebir; /* 0x00124 */
+ volatile __u32 etbr_h; /* 0x00128 */
+ volatile __u32 etbr_l; /* 0x0012c */
+ volatile __u32 etcir; /* 0x00130 */
+ volatile __u32 etpir; /* 0x00134 */
+ volatile __u32 emar_h; /* 0x00138 */
+ volatile __u32 emar_l; /* 0x0013c */
+ volatile __u32 ehar_h; /* 0x00140 */
+ volatile __u32 ehar_l; /* 0x00144 */
+ volatile __u32 micr; /* 0x00148 */
+ volatile __u32 midr_r; /* 0x0014c */
+ volatile __u32 midr_w; /* 0x00150 */
+ volatile __u32 pad1[(0x20000 - 0x00154) / 4];
/* SuperIO Registers XXX */
struct ioc3_sioregs sregs; /* 0x20000 */
- volatile u32 pad2[(0x40000 - 0x20180) / 4];
+ volatile __u32 pad2[(0x40000 - 0x20180) / 4];
/* SSRAM Diagnostic Access */
- volatile u32 ssram[(0x80000 - 0x40000) / 4];
+ volatile __u32 ssram[(0x80000 - 0x40000) / 4];
/* Bytebus device offsets
0x80000 - Access to the generic devices selected with DEV0
@@ -179,8 +179,8 @@
* Ethernet RX Buffer
*/
struct ioc3_erxbuf {
- u32 w0; /* first word (valid,bcnt,cksum) */
- u32 err; /* second word various errors */
+ __u32 w0; /* first word (valid,bcnt,cksum) */
+ __u32 err; /* second word various errors */
/* next comes n bytes of padding */
/* then the received ethernet frame itself */
};
@@ -208,11 +208,11 @@
*/
#define ETXD_DATALEN 104
struct ioc3_etxd {
- u32 cmd; /* command field */
- u32 bufcnt; /* buffer counts field */
- u64 p1; /* buffer pointer 1 */
- u64 p2; /* buffer pointer 2 */
- u8 data[ETXD_DATALEN]; /* opt. tx data */
+ __u32 cmd; /* command field */
+ __u32 bufcnt; /* buffer counts field */
+ __u64 p1; /* buffer pointer 1 */
+ __u64 p2; /* buffer pointer 2 */
+ __u8 data[ETXD_DATALEN]; /* opt. tx data */
};
#define ETXD_BYTECNT_MASK 0x000007ff /* total byte count */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/klconfig.h 2004-03-28 07:51:55.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/klconfig.h 2004-08-26 05:26:13.000000000 -0500
@@ -64,9 +64,9 @@
#define KLCFGINFO_MAGIC 0xbeedbabe
#ifdef FRUTEST
-typedef u64 klconf_off_t;
+typedef __u64 klconf_off_t;
#else
-typedef s32 klconf_off_t;
+typedef __s32 klconf_off_t;
#endif
/*
@@ -160,8 +160,8 @@
/* Functions/macros needed to use this structure */
typedef struct kl_config_hdr {
- u64 ch_magic; /* set this to KLCFGINFO_MAGIC */
- u32 ch_version; /* structure version number */
+ __u64 ch_magic; /* set this to KLCFGINFO_MAGIC */
+ __u32 ch_version; /* structure version number */
klconf_off_t ch_malloc_hdr_off; /* offset of ch_malloc_hdr */
klconf_off_t ch_cons_off; /* offset of ch_cons */
klconf_off_t ch_board_info; /* the link list of boards */
@@ -609,14 +609,14 @@
/* Info holders for various hardware components */
-typedef u64 *pci_t;
-typedef u64 *vmeb_t;
-typedef u64 *vmed_t;
-typedef u64 *fddi_t;
-typedef u64 *scsi_t;
-typedef u64 *mio_t;
-typedef u64 *graphics_t;
-typedef u64 *router_t;
+typedef __u64 *pci_t;
+typedef __u64 *vmeb_t;
+typedef __u64 *vmed_t;
+typedef __u64 *fddi_t;
+typedef __u64 *scsi_t;
+typedef __u64 *mio_t;
+typedef __u64 *graphics_t;
+typedef __u64 *router_t;
/*
* The port info in ip27_cfg area translates to a lboart_t in the
@@ -659,7 +659,7 @@
klport_t hub_port; /* hub is connected to this */
nic_t hub_box_nic; /* nic of containing box */
klconf_off_t hub_mfg_nic; /* MFG NIC string */
- u64 hub_speed; /* Speed of hub in HZ */
+ __u64 hub_speed; /* Speed of hub in HZ */
} klhub_t ;
typedef struct klhub_uart_s { /* HUB */
@@ -716,8 +716,8 @@
#define MAX_PCI_SLOTS 8
typedef struct klpci_device_s {
- s32 pci_device_id; /* 32 bits of vendor/device ID. */
- s32 pci_device_pad; /* 32 bits of padding. */
+ __s32 pci_device_id; /* 32 bits of vendor/device ID. */
+ __s32 pci_device_pad; /* 32 bits of padding. */
} klpci_device_t;
#define BRIDGE_STRUCT_VERSION 2
@@ -767,7 +767,7 @@
nic_t rou_box_nic ; /* nic of the containing module */
klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */
klconf_off_t rou_mfg_nic ; /* MFG NIC string */
- u64 rou_vector; /* vector from master node */
+ __u64 rou_vector; /* vector from master node */
} klrou_t ;
/*
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/kldir.h 2004-01-17 17:03:49.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/kldir.h 2004-08-26 05:26:25.000000000 -0500
@@ -210,7 +210,7 @@
#ifndef __ASSEMBLY__
typedef struct kldir_ent_s {
- u64 magic; /* Indicates validity of entry */
+ __u64 magic; /* Indicates validity of entry */
off_t offset; /* Offset from start of node space */
#if defined(CONFIG_SGI_IO) /* FIXME */
__psunsigned_t pointer; /* Pointer to area in some cases */
@@ -218,7 +218,7 @@
unsigned long pointer; /* Pointer to area in some cases */
#endif
size_t size; /* Size in bytes */
- u64 count; /* Repeat count if array, 1 if not */
+ __u64 count; /* Repeat count if array, 1 if not */
size_t stride; /* Stride if array, 0 if not */
char rsvd[16]; /* Pad entry to 0x40 bytes */
/* NOTE: These 16 bytes are used in the Partition KLDIR
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/launch.h 2004-01-17 17:03:49.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/launch.h 2004-08-26 05:25:52.000000000 -0500
@@ -62,14 +62,14 @@
#ifndef __ASSEMBLY__
typedef int launch_state_t;
-typedef void (*launch_proc_t)(u64 call_parm);
+typedef void (*launch_proc_t)(__u64 call_parm);
typedef struct launch_s {
- volatile u64 magic; /* Magic number */
- volatile u64 busy; /* Slave currently active */
+ volatile __u64 magic; /* Magic number */
+ volatile __u64 busy; /* Slave currently active */
volatile launch_proc_t call_addr; /* Func. for slave to call */
- volatile u64 call_addr_c; /* 1's complement of call_addr*/
- volatile u64 call_parm; /* Single parm passed to call*/
+ volatile __u64 call_addr_c; /* 1's complement of call_addr*/
+ volatile __u64 call_parm; /* Single parm passed to call*/
volatile void *stack_addr; /* Stack pointer for slave function */
volatile void *gp_addr; /* Global pointer for slave func. */
volatile char *bevutlb;/* Address of bev utlb ex handler */
@@ -84,7 +84,7 @@
#define LAUNCH_SLAVE (*(void (*)(int nasid, int cpu, \
launch_proc_t call_addr, \
- u64 call_parm, \
+ __u64 call_parm, \
void *stack_addr, \
void *gp_addr)) \
IP27PROM_LAUNCHSLAVE)
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubio.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubio.h 2004-08-26 05:27:21.000000000 -0500
@@ -172,9 +172,9 @@
#ifndef __ASSEMBLY__
typedef union hubii_wid_u {
- u64 wid_reg_value;
+ __u64 wid_reg_value;
struct {
- u64 wid_rsvd: 32, /* unused */
+ __u64 wid_rsvd: 32, /* unused */
wid_rev_num: 4, /* revision number */
wid_part_num: 16, /* the widget type: hub=c101 */
wid_mfg_num: 11, /* Manufacturer id (IBM) */
@@ -184,9 +184,9 @@
typedef union hubii_wcr_u {
- u64 wcr_reg_value;
+ __u64 wcr_reg_value;
struct {
- u64 wcr_rsvd: 41, /* unused */
+ __u64 wcr_rsvd: 41, /* unused */
wcr_e_thresh: 5, /* elasticity threshold */
wcr_dir_con: 1, /* widget direct connect */
wcr_f_bad_pkt: 1, /* Force bad llp pkt enable */
@@ -200,9 +200,9 @@
#define iwcr_dir_con wcr_fields_s.wcr_dir_con
typedef union hubii_wstat_u {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 rsvd1: 31,
+ __u64 rsvd1: 31,
crazy: 1, /* Crazy bit */
rsvd2: 8,
llp_tx_cnt: 8, /* LLP Xmit retry counter */
@@ -217,9 +217,9 @@
typedef union hubii_ilcsr_u {
- u64 icsr_reg_value;
+ __u64 icsr_reg_value;
struct {
- u64 icsr_rsvd: 22, /* unused */
+ __u64 icsr_rsvd: 22, /* unused */
icsr_max_burst: 10, /* max burst */
icsr_rsvd4: 6, /* reserved */
icsr_max_retry: 10, /* max retry */
@@ -237,9 +237,9 @@
typedef union hubii_iowa_u {
- u64 iowa_reg_value;
+ __u64 iowa_reg_value;
struct {
- u64 iowa_rsvd: 48, /* unused */
+ __u64 iowa_rsvd: 48, /* unused */
iowa_wxoac: 8, /* xtalk widget access bits */
iowa_rsvd1: 7, /* xtalk widget access bits */
iowa_w0oac: 1; /* xtalk widget access bits */
@@ -247,9 +247,9 @@
} hubii_iowa_t;
typedef union hubii_iiwa_u {
- u64 iiwa_reg_value;
+ __u64 iiwa_reg_value;
struct {
- u64 iiwa_rsvd: 48, /* unused */
+ __u64 iiwa_rsvd: 48, /* unused */
iiwa_wxiac: 8, /* hub wid access bits */
iiwa_rsvd1: 7, /* reserved */
iiwa_w0iac: 1; /* hub wid0 access */
@@ -257,9 +257,9 @@
} hubii_iiwa_t;
typedef union hubii_illr_u {
- u64 illr_reg_value;
+ __u64 illr_reg_value;
struct {
- u64 illr_rsvd: 32, /* unused */
+ __u64 illr_rsvd: 32, /* unused */
illr_cb_cnt: 16, /* checkbit error count */
illr_sn_cnt: 16; /* sequence number count */
} illr_fields_s;
@@ -271,9 +271,9 @@
/* io_perf_sel allows the caller to specify what tests will be
performed */
typedef union io_perf_sel {
- u64 perf_sel_reg;
+ __u64 perf_sel_reg;
struct {
- u64 perf_rsvd : 48,
+ __u64 perf_rsvd : 48,
perf_icct : 8,
perf_ippr1 : 4,
perf_ippr0 : 4;
@@ -284,9 +284,9 @@
hardware problems there is only one counter, not two. */
typedef union io_perf_cnt {
- u64 perf_cnt;
+ __u64 perf_cnt;
struct {
- u64 perf_rsvd1 : 32,
+ __u64 perf_rsvd1 : 32,
perf_rsvd2 : 12,
perf_cnt : 20;
} perf_cnt_bits;
@@ -442,9 +442,9 @@
*/
#ifndef __ASSEMBLY__
typedef union icrba_u {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 resvd: 6,
+ __u64 resvd: 6,
stall_bte0: 1, /* Stall BTE 0 */
stall_bte1: 1, /* Stall BTE 1 */
error: 1, /* CRB has an error */
@@ -464,10 +464,10 @@
runtime selection of the format based on the REV_ID field of the
NI_STATUS_REV_ID register. */
typedef union h1_icrba_u {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 resvd: 6,
+ __u64 resvd: 6,
unused: 1, /* Unused but RW!! */
error: 1, /* CRB has an error */
ecode: 4, /* Error Code */
@@ -525,9 +525,9 @@
*/
#ifndef __ASSEMBLY__
typedef union icrbb_u {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 rsvd1: 5,
+ __u64 rsvd1: 5,
btenum: 1, /* BTE to which entry belongs to */
cohtrans: 1, /* Coherent transaction */
xtsize: 2, /* Xtalk operation size
@@ -567,9 +567,9 @@
runtime selection of the format based on the REV_ID field of the
NI_STATUS_REV_ID register. */
typedef union h1_icrbb_u {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 rsvd1: 5,
+ __u64 rsvd1: 5,
btenum: 1, /* BTE to which entry belongs to */
cohtrans: 1, /* Coherent transaction */
xtsize: 2, /* Xtalk operation size
@@ -683,9 +683,9 @@
#ifndef __ASSEMBLY__
typedef union icrbc_s {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 rsvd: 6,
+ __u64 rsvd: 6,
sleep: 1,
pricnt: 4, /* Priority count sent with Read req */
pripsc: 4, /* Priority Pre scalar */
@@ -720,9 +720,9 @@
#ifndef __ASSEMBLY__
typedef union icrbd_s {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 rsvd: 38,
+ __u64 rsvd: 38,
toutvld: 1, /* Timeout in progress for this CRB */
ctxtvld: 1, /* Context field below is valid */
rsvd2: 1,
@@ -742,9 +742,9 @@
typedef union hubii_ifdr_u {
- u64 hi_ifdr_value;
+ __u64 hi_ifdr_value;
struct {
- u64 ifdr_rsvd: 49,
+ __u64 ifdr_rsvd: 49,
ifdr_maxrp: 7,
ifdr_rsvd1: 1,
ifdr_maxrq: 7;
@@ -801,9 +801,9 @@
#ifndef __ASSEMBLY__
typedef union iprte_a {
- u64 entry;
+ __u64 entry;
struct {
- u64 rsvd1 : 7, /* Reserved field */
+ __u64 rsvd1 : 7, /* Reserved field */
valid : 1, /* Maps to a timeout entry */
rsvd2 : 1,
srcnode : 9, /* Node which did this PIO */
@@ -835,9 +835,9 @@
*/
typedef union iprb_u {
- u64 reg_value;
+ __u64 reg_value;
struct {
- u64 rsvd1: 15,
+ __u64 rsvd1: 15,
error: 1, /* Widget rcvd wr resp pkt w/ error */
ovflow: 5, /* Over flow count. perf measurement */
fire_and_forget: 1, /* Launch Write without response */
@@ -877,9 +877,9 @@
*/
#ifndef __ASSEMBLY__
typedef union icrbp_a {
- u64 ip_reg; /* the entire register value */
+ __u64 ip_reg; /* the entire register value */
struct {
- u64 error: 1, /* 63, error occurred */
+ __u64 error: 1, /* 63, error occurred */
ln_uce: 1, /* 62: uncorrectable memory */
ln_ae: 1, /* 61: protection violation */
ln_werr:1, /* 60: write access error */
@@ -919,9 +919,9 @@
#ifndef __ASSEMBLY__
typedef union hubii_idsr {
- u64 iin_reg;
+ __u64 iin_reg;
struct {
- u64 rsvd1 : 35,
+ __u64 rsvd1 : 35,
isent : 1,
rsvd2 : 3,
ienable: 1,
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubmd.h 2004-01-17 17:03:49.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubmd.h 2004-08-26 05:27:00.000000000 -0500
@@ -541,7 +541,7 @@
*/
struct dir_error_reg {
- u64 uce_vld: 1, /* 63: valid directory uce */
+ __u64 uce_vld: 1, /* 63: valid directory uce */
ae_vld: 1, /* 62: valid dir prot ecc error */
ce_vld: 1, /* 61: valid correctable ECC err*/
rsvd1: 19, /* 60-42: reserved */
@@ -555,13 +555,13 @@
};
typedef union md_dir_error {
- u64 derr_reg; /* the entire register */
+ __u64 derr_reg; /* the entire register */
struct dir_error_reg derr_fmt; /* the register format */
} md_dir_error_t;
struct mem_error_reg {
- u64 uce_vld: 1, /* 63: valid memory uce */
+ __u64 uce_vld: 1, /* 63: valid memory uce */
ce_vld: 1, /* 62: valid correctable ECC err*/
rsvd1: 22, /* 61-40: reserved */
bad_syn: 8, /* 39-32: bad mem ecc syndrome */
@@ -573,13 +573,13 @@
typedef union md_mem_error {
- u64 merr_reg; /* the entire register */
+ __u64 merr_reg; /* the entire register */
struct mem_error_reg merr_fmt; /* format of the mem_error reg */
} md_mem_error_t;
struct proto_error_reg {
- u64 valid: 1, /* 63: valid protocol error */
+ __u64 valid: 1, /* 63: valid protocol error */
rsvd1: 2, /* 62-61: reserved */
initiator:11, /* 60-50: id of request initiator*/
backoff: 2, /* 49-48: backoff control */
@@ -594,7 +594,7 @@
};
typedef union md_proto_error {
- u64 perr_reg; /* the entire register */
+ __u64 perr_reg; /* the entire register */
struct proto_error_reg perr_fmt; /* format of the register */
} md_proto_error_t;
@@ -642,7 +642,7 @@
struct md_pdir_high_fmt {
- u64 pd_hi_unused : 16,
+ __u64 pd_hi_unused : 16,
pd_hi_bvec : 38,
pd_hi_unused1 : 3,
pd_hi_ecc : 7;
@@ -651,14 +651,14 @@
typedef union md_pdir_high {
/* The 48 bits of standard directory, upper word */
- u64 pd_hi_val;
+ __u64 pd_hi_val;
struct md_pdir_high_fmt pd_hi_fmt;
}md_pdir_high_t;
struct md_pdir_low_shared_fmt {
/* The meaning of lower directory, shared */
- u64 pds_lo_unused : 16,
+ __u64 pds_lo_unused : 16,
pds_lo_bvec : 26,
pds_lo_cnt : 6,
pds_lo_state : 3,
@@ -670,7 +670,7 @@
struct md_pdir_low_exclusive_fmt {
/* The meaning of lower directory, exclusive */
- u64 pde_lo_unused : 31,
+ __u64 pde_lo_unused : 31,
pde_lo_ptr : 11,
pde_lo_unused1 : 6,
pde_lo_state : 3,
@@ -683,7 +683,7 @@
typedef union md_pdir_loent {
/* The 48 bits of premium directory, lower word */
- u64 pd_lo_val;
+ __u64 pd_lo_val;
struct md_pdir_low_exclusive_fmt pde_lo_fmt;
struct md_pdir_low_shared_fmt pds_lo_fmt;
}md_pdir_low_t;
@@ -711,25 +711,25 @@
} bddir_entry_t;
typedef struct dir_mem_entry {
- u64 prcpf[MAX_REGIONS];
+ __u64 prcpf[MAX_REGIONS];
bddir_entry_t directory_words[MD_PAGE_SIZE/CACHE_SLINE_SIZE];
} dir_mem_entry_t;
typedef union md_perf_sel {
- u64 perf_sel_reg;
+ __u64 perf_sel_reg;
struct {
- u64 perf_rsvd : 60,
+ __u64 perf_rsvd : 60,
perf_en : 1,
perf_sel : 3;
} perf_sel_bits;
} md_perf_sel_t;
typedef union md_perf_cnt {
- u64 perf_cnt;
+ __u64 perf_cnt;
struct {
- u64 perf_rsvd : 44,
+ __u64 perf_rsvd : 44,
perf_cnt : 20;
} perf_cnt_bits;
} md_perf_cnt_t;
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubni.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubni.h 2004-08-26 05:26:48.000000000 -0500
@@ -229,9 +229,9 @@
#ifndef __ASSEMBLY__
typedef union hubni_port_error_u {
- u64 nipe_reg_value;
+ __u64 nipe_reg_value;
struct {
- u64 nipe_rsvd: 26, /* unused */
+ __u64 nipe_rsvd: 26, /* unused */
nipe_lnk_reset: 1, /* link reset */
nipe_intl_err: 1, /* internal error */
nipe_bad_msg: 1, /* bad message */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubpi.h 2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubpi.h 2004-08-26 05:26:36.000000000 -0500
@@ -312,7 +312,7 @@
*/
struct err_stack_format {
- u64 sk_addr : 33, /* address */
+ __u64 sk_addr : 33, /* address */
sk_cmd : 8, /* message command */
sk_crb_sts : 10, /* status from RRB or WRB */
sk_rw_rb : 1, /* RRB == 0, WRB == 1 */
@@ -323,12 +323,12 @@
};
typedef union pi_err_stack {
- u64 pi_stk_word;
+ __u64 pi_stk_word;
struct err_stack_format pi_stk_fmt;
} pi_err_stack_t;
struct err_status0_format {
- u64 s0_valid : 1, /* Valid */
+ __u64 s0_valid : 1, /* Valid */
s0_ovr_run : 1, /* Overrun, spooled to memory */
s0_addr : 37, /* address */
s0_cmd : 8, /* message command */
@@ -338,12 +338,12 @@
};
typedef union pi_err_stat0 {
- u64 pi_stat0_word;
+ __u64 pi_stat0_word;
struct err_status0_format pi_stat0_fmt;
} pi_err_stat0_t;
struct err_status1_format {
- u64 s1_src : 11, /* message source */
+ __u64 s1_src : 11, /* message source */
s1_crb_sts : 10, /* status from RRB or WRB */
s1_rw_rb : 1, /* RRB == 0, WRB == 1 */
s1_crb_num : 3, /* WRB (0 to 7) or RRB (0 to 4) */
@@ -353,11 +353,11 @@
};
typedef union pi_err_stat1 {
- u64 pi_stat1_word;
+ __u64 pi_stat1_word;
struct err_status1_format pi_stat1_fmt;
} pi_err_stat1_t;
-typedef u64 rtc_time_t;
+typedef __u64 rtc_time_t;
#endif /* !__ASSEMBLY__ */
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/stackframe.h 2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/stackframe.h 2004-08-26 05:14:41.000000000 -0500
@@ -25,7 +25,7 @@
.macro SAVE_TEMP
mfhi v1
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
LONG_S $8, PT_R8(sp)
LONG_S $9, PT_R9(sp)
#endif
@@ -55,7 +55,7 @@
#ifdef CONFIG_SMP
.macro get_saved_sp /* SMP variation */
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
mfc0 k0, CP0_CONTEXT
lui k1, %hi(kernelsp)
srl k0, k0, 23
@@ -63,7 +63,7 @@
addu k1, k0
LONG_L k1, %lo(kernelsp)(k1)
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
MFC0 k1, CP0_CONTEXT
dsra k1, 23
lui k0, %hi(pgd_current)
@@ -76,13 +76,13 @@
.endm
.macro set_saved_sp stackp temp temp2
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
mfc0 \temp, CP0_CONTEXT
srl \temp, 23
sll \temp, 2
LONG_S \stackp, kernelsp(\temp)
#endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
lw \temp, TI_CPU(gp)
dsll \temp, 3
lui \temp2, %hi(kernelsp)
@@ -127,7 +127,7 @@
LONG_S $6, PT_R6(sp)
MFC0 v1, CP0_EPC
LONG_S $7, PT_R7(sp)
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
LONG_S $8, PT_R8(sp)
LONG_S $9, PT_R9(sp)
#endif
@@ -156,7 +156,7 @@
.macro RESTORE_TEMP
LONG_L $24, PT_LO(sp)
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
@@ -204,7 +204,7 @@
LONG_L $31, PT_R31(sp)
LONG_L $28, PT_R28(sp)
LONG_L $25, PT_R25(sp)
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
@@ -249,7 +249,7 @@
LONG_L $31, PT_R31(sp)
LONG_L $28, PT_R28(sp)
LONG_L $25, PT_R25(sp)
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/system.h 2004-08-18 13:15:42.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/system.h 2004-08-28 18:13:39.000000000 -0500
@@ -15,10 +15,11 @@
#include <asm/sgidefs.h>
#include <linux/kernel.h>
+#include <linux/linkage.h>
#include <asm/addrspace.h>
#include <asm/ptrace.h>
-#include <asm/hazards.h>
+#include <asm/types.h>
__asm__ (
".macro\tlocal_irq_enable\n\t"
@@ -311,7 +312,7 @@
return retval;
}
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val)
{
__u64 retval;
@@ -406,7 +407,7 @@
return retval;
}
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
unsigned long new)
{
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/tx4927/tx4927_mips.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/tx4927/tx4927_mips.h 2004-08-26 05:22:30.000000000 -0500
@@ -36,15 +36,15 @@
".set\tmips0");
}
-#define reg_rd08(r) ((u8 )(*((vu8 *)(r))))
-#define reg_rd16(r) ((u16)(*((vu16*)(r))))
-#define reg_rd32(r) ((u32)(*((vu32*)(r))))
-#define reg_rd64(r) ((u64)(*((vu64*)(r))))
+#define reg_rd08(r) ((__u8 )(*((vu8 *)(r))))
+#define reg_rd16(r) ((__u16)(*((vu16*)(r))))
+#define reg_rd32(r) ((__u32)(*((vu32*)(r))))
+#define reg_rd64(r) ((__u64)(*((vu64*)(r))))
-#define reg_wr08(r,v) ((*((vu8 *)(r)))=((u8 )(v)))
-#define reg_wr16(r,v) ((*((vu16*)(r)))=((u16)(v)))
-#define reg_wr32(r,v) ((*((vu32*)(r)))=((u32)(v)))
-#define reg_wr64(r,v) ((*((vu64*)(r)))=((u64)(v)))
+#define reg_wr08(r,v) ((*((vu8 *)(r)))=((__u8 )(v)))
+#define reg_wr16(r,v) ((*((vu16*)(r)))=((__u16)(v)))
+#define reg_wr32(r,v) ((*((vu32*)(r)))=((__u32)(v)))
+#define reg_wr64(r,v) ((*((vu64*)(r)))=((__u64)(v)))
typedef volatile __signed char vs8;
typedef volatile unsigned char vu8;
@@ -55,10 +55,10 @@
typedef volatile __signed int vs32;
typedef volatile unsigned int vu32;
-typedef s8 s08;
+typedef __s8 s08;
typedef vs8 vs08;
-typedef u8 u08;
+typedef __u8 u08;
typedef vu8 vu08;
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/unaligned.h 2004-08-15 15:38:27.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/unaligned.h 2004-08-26 05:22:21.000000000 -0500
@@ -17,7 +17,7 @@
*
* This macro should be used for accessing values larger in size than
* single bytes at locations that are expected to be improperly aligned,
- * e.g. retrieving a u16 value from a location not u16-aligned.
+ * e.g. retrieving a __u16 value from a location not __u16-aligned.
*
* Note that unaligned accesses can be very expensive on some architectures.
*/
@@ -31,7 +31,7 @@
*
* This macro should be used for placing values larger in size than
* single bytes at locations that are expected to be improperly aligned,
- * e.g. writing a u16 value to a location not u16-aligned.
+ * e.g. writing a __u16 value to a location not __u16-aligned.
*
* Note that unaligned accesses can be very expensive on some architectures.
*/
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
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/xtalk/xwidget.h 2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/xtalk/xwidget.h 2004-08-26 05:23:33.000000000 -0500
@@ -92,7 +92,7 @@
* defined here
*/
#ifndef __ASSEMBLY__
-typedef u32 widgetreg_t;
+typedef __u32 widgetreg_t;
/* widget configuration registers */
typedef volatile struct widget_cfg {
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/acpi.h 2004-08-18 13:16:01.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/acpi.h 2004-08-26 05:41:49.000000000 -0500
@@ -51,49 +51,49 @@
struct acpi_table_rsdp {
char signature[8];
- u8 checksum;
+ __u8 checksum;
char oem_id[6];
- u8 revision;
- u32 rsdt_address;
+ __u8 revision;
+ __u32 rsdt_address;
} __attribute__ ((packed));
struct acpi20_table_rsdp {
char signature[8];
- u8 checksum;
+ __u8 checksum;
char oem_id[6];
- u8 revision;
- u32 rsdt_address;
- u32 length;
- u64 xsdt_address;
- u8 ext_checksum;
- u8 reserved[3];
+ __u8 revision;
+ __u32 rsdt_address;
+ __u32 length;
+ __u64 xsdt_address;
+ __u8 ext_checksum;
+ __u8 reserved[3];
} __attribute__ ((packed));
typedef struct {
- u8 type;
- u8 length;
+ __u8 type;
+ __u8 length;
} __attribute__ ((packed)) acpi_table_entry_header;
/* Root System Description Table (RSDT) */
struct acpi_table_rsdt {
struct acpi_table_header header;
- u32 entry[8];
+ __u32 entry[8];
} __attribute__ ((packed));
/* Extended System Description Table (XSDT) */
struct acpi_table_xsdt {
struct acpi_table_header header;
- u64 entry[1];
+ __u64 entry[1];
} __attribute__ ((packed));
/* Fixed ACPI Description Table (FADT) */
struct acpi_table_fadt {
struct acpi_table_header header;
- u32 facs_addr;
- u32 dsdt_addr;
+ __u32 facs_addr;
+ __u32 dsdt_addr;
/* ... */
} __attribute__ ((packed));
@@ -101,10 +101,10 @@
struct acpi_table_madt {
struct acpi_table_header header;
- u32 lapic_address;
+ __u32 lapic_address;
struct {
- u32 pcat_compat:1;
- u32 reserved:31;
+ __u32 pcat_compat:1;
+ __u32 reserved:31;
} flags;
} __attribute__ ((packed));
@@ -122,85 +122,85 @@
};
typedef struct {
- u16 polarity:2;
- u16 trigger:2;
- u16 reserved:12;
+ __u16 polarity:2;
+ __u16 trigger:2;
+ __u16 reserved:12;
} __attribute__ ((packed)) acpi_interrupt_flags;
struct acpi_table_lapic {
acpi_table_entry_header header;
- u8 acpi_id;
- u8 id;
+ __u8 acpi_id;
+ __u8 id;
struct {
- u32 enabled:1;
- u32 reserved:31;
+ __u32 enabled:1;
+ __u32 reserved:31;
} flags;
} __attribute__ ((packed));
struct acpi_table_ioapic {
acpi_table_entry_header header;
- u8 id;
- u8 reserved;
- u32 address;
- u32 global_irq_base;
+ __u8 id;
+ __u8 reserved;
+ __u32 address;
+ __u32 global_irq_base;
} __attribute__ ((packed));
struct acpi_table_int_src_ovr {
acpi_table_entry_header header;
- u8 bus;
- u8 bus_irq;
- u32 global_irq;
+ __u8 bus;
+ __u8 bus_irq;
+ __u32 global_irq;
acpi_interrupt_flags flags;
} __attribute__ ((packed));
struct acpi_table_nmi_src {
acpi_table_entry_header header;
acpi_interrupt_flags flags;
- u32 global_irq;
+ __u32 global_irq;
} __attribute__ ((packed));
struct acpi_table_lapic_nmi {
acpi_table_entry_header header;
- u8 acpi_id;
+ __u8 acpi_id;
acpi_interrupt_flags flags;
- u8 lint;
+ __u8 lint;
} __attribute__ ((packed));
struct acpi_table_lapic_addr_ovr {
acpi_table_entry_header header;
- u8 reserved[2];
- u64 address;
+ __u8 reserved[2];
+ __u64 address;
} __attribute__ ((packed));
struct acpi_table_iosapic {
acpi_table_entry_header header;
- u8 id;
- u8 reserved;
- u32 global_irq_base;
- u64 address;
+ __u8 id;
+ __u8 reserved;
+ __u32 global_irq_base;
+ __u64 address;
} __attribute__ ((packed));
struct acpi_table_lsapic {
acpi_table_entry_header header;
- u8 acpi_id;
- u8 id;
- u8 eid;
- u8 reserved[3];
+ __u8 acpi_id;
+ __u8 id;
+ __u8 eid;
+ __u8 reserved[3];
struct {
- u32 enabled:1;
- u32 reserved:31;
+ __u32 enabled:1;
+ __u32 reserved:31;
} flags;
} __attribute__ ((packed));
struct acpi_table_plat_int_src {
acpi_table_entry_header header;
acpi_interrupt_flags flags;
- u8 type; /* See acpi_interrupt_type */
- u8 id;
- u8 eid;
- u8 iosapic_vector;
- u32 global_irq;
- u32 reserved;
+ __u8 type; /* See acpi_interrupt_type */
+ __u8 id;
+ __u8 eid;
+ __u8 iosapic_vector;
+ __u32 global_irq;
+ __u32 reserved;
} __attribute__ ((packed));
enum acpi_interrupt_id {
@@ -213,21 +213,21 @@
#define ACPI_SPACE_MEM 0
struct acpi_gen_regaddr {
- u8 space_id;
- u8 bit_width;
- u8 bit_offset;
- u8 resv;
- u32 addrl;
- u32 addrh;
+ __u8 space_id;
+ __u8 bit_width;
+ __u8 bit_offset;
+ __u8 resv;
+ __u32 addrl;
+ __u32 addrh;
} __attribute__ ((packed));
struct acpi_table_hpet {
struct acpi_table_header header;
- u32 id;
+ __u32 id;
struct acpi_gen_regaddr addr;
- u8 number;
- u16 min_tick;
- u8 page_protect;
+ __u8 number;
+ __u16 min_tick;
+ __u8 page_protect;
} __attribute__ ((packed));
/*
@@ -236,17 +236,17 @@
*/
struct acpi_table_sbf
{
- u8 sbf_signature[4];
- u32 sbf_len;
- u8 sbf_revision;
- u8 sbf_csum;
- u8 sbf_oemid[6];
- u8 sbf_oemtable[8];
- u8 sbf_revdata[4];
- u8 sbf_creator[4];
- u8 sbf_crearev[4];
- u8 sbf_cmos;
- u8 sbf_spare[3];
+ __u8 sbf_signature[4];
+ __u32 sbf_len;
+ __u8 sbf_revision;
+ __u8 sbf_csum;
+ __u8 sbf_oemid[6];
+ __u8 sbf_oemtable[8];
+ __u8 sbf_revdata[4];
+ __u8 sbf_creator[4];
+ __u8 sbf_crearev[4];
+ __u8 sbf_cmos;
+ __u8 sbf_spare[3];
} __attribute__ ((packed));
/*
@@ -256,8 +256,8 @@
struct acpi_table_srat {
struct acpi_table_header header;
- u32 table_revision;
- u64 reserved;
+ __u32 table_revision;
+ __u64 reserved;
} __attribute__ ((packed));
enum acpi_srat_entry_id {
@@ -268,31 +268,31 @@
struct acpi_table_processor_affinity {
acpi_table_entry_header header;
- u8 proximity_domain;
- u8 apic_id;
+ __u8 proximity_domain;
+ __u8 apic_id;
struct {
- u32 enabled:1;
- u32 reserved:31;
+ __u32 enabled:1;
+ __u32 reserved:31;
} flags;
- u8 lsapic_eid;
- u8 reserved[7];
+ __u8 lsapic_eid;
+ __u8 reserved[7];
} __attribute__ ((packed));
struct acpi_table_memory_affinity {
acpi_table_entry_header header;
- u8 proximity_domain;
- u8 reserved1[5];
- u32 base_addr_lo;
- u32 base_addr_hi;
- u32 length_lo;
- u32 length_hi;
- u32 memory_type; /* See acpi_address_range_id */
+ __u8 proximity_domain;
+ __u8 reserved1[5];
+ __u32 base_addr_lo;
+ __u32 base_addr_hi;
+ __u32 length_lo;
+ __u32 length_hi;
+ __u32 memory_type; /* See acpi_address_range_id */
struct {
- u32 enabled:1;
- u32 hot_pluggable:1;
- u32 reserved:30;
+ __u32 enabled:1;
+ __u32 hot_pluggable:1;
+ __u32 reserved:30;
} flags;
- u64 reserved2;
+ __u64 reserved2;
} __attribute__ ((packed));
enum acpi_address_range_id {
@@ -310,17 +310,17 @@
struct acpi_table_slit {
struct acpi_table_header header;
- u64 localities;
- u8 entry[1]; /* real size = localities^2 */
+ __u64 localities;
+ __u8 entry[1]; /* real size = localities^2 */
} __attribute__ ((packed));
/* Smart Battery Description Table (SBST) */
struct acpi_table_sbst {
struct acpi_table_header header;
- u32 warning; /* Warn user */
- u32 low; /* Critical sleep */
- u32 critical; /* Critical shutdown */
+ __u32 warning; /* Warn user */
+ __u32 low; /* Critical sleep */
+ __u32 critical; /* Critical shutdown */
} __attribute__ ((packed));
/* Embedded Controller Boot Resources Table (ECDT) */
@@ -329,8 +329,8 @@
struct acpi_table_header header;
struct acpi_generic_address ec_control;
struct acpi_generic_address ec_data;
- u32 uid;
- u8 gpe_bit;
+ __u32 uid;
+ __u8 gpe_bit;
char ec_id[0];
} __attribute__ ((packed));
@@ -338,9 +338,9 @@
struct acpi_table_mcfg {
struct acpi_table_header header;
- u8 reserved[8];
- u32 base_address;
- u32 base_reserved;
+ __u8 reserved[8];
+ __u32 base_address;
+ __u32 base_reserved;
} __attribute__ ((packed));
/* Table Handlers */
@@ -396,7 +396,7 @@
extern int acpi_mp_config;
-extern u32 pci_mmcfg_base_addr;
+extern __u32 pci_mmcfg_base_addr;
extern int sbf_port ;
@@ -411,20 +411,20 @@
#endif /*!CONFIG_ACPI_BOOT*/
-unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
-int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
+unsigned int acpi_register_gsi (__u32 gsi, int edge_level, int active_high_low);
+int acpi_gsi_to_irq (__u32 gsi, unsigned int *irq);
#ifdef CONFIG_ACPI_PCI
struct acpi_prt_entry {
struct list_head node;
struct acpi_pci_id id;
- u8 pin;
+ __u8 pin;
struct {
acpi_handle handle;
- u32 index;
+ __u32 index;
} link;
- u32 irq;
+ __u32 irq;
};
struct acpi_prt_list {
@@ -451,8 +451,8 @@
#ifdef CONFIG_ACPI_EC
-int ec_read(u8 addr, u8 *val);
-int ec_write(u8 addr, u8 val);
+int ec_read(__u8 addr, __u8 *val);
+int ec_write(__u8 addr, __u8 val);
#endif /*CONFIG_ACPI_EC*/
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_i.h 2003-12-31 17:46:48.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/affs_fs_i.h 2004-08-26 05:41:49.000000000 -0500
@@ -9,13 +9,13 @@
//#define AFFS_CACHE_SIZE (4*4)
#define AFFS_MAX_PREALLOC 32
-#define AFFS_LC_SIZE (AFFS_CACHE_SIZE/sizeof(u32)/2)
+#define AFFS_LC_SIZE (AFFS_CACHE_SIZE/sizeof(__u32)/2)
#define AFFS_AC_SIZE (AFFS_CACHE_SIZE/sizeof(struct affs_ext_key)/2)
#define AFFS_AC_MASK (AFFS_AC_SIZE-1)
struct affs_ext_key {
- u32 ext; /* idx of the extended block */
- u32 key; /* block number */
+ __u32 ext; /* idx of the extended block */
+ __u32 key; /* block number */
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_sb.h 2004-08-18 13:16:01.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/affs_fs_sb.h 2004-08-26 05:41:49.000000000 -0500
@@ -9,8 +9,8 @@
*/
struct affs_bm_info {
- u32 bm_key; /* Disk block number */
- u32 bm_free; /* Free blocks in here */
+ __u32 bm_key; /* Disk block number */
+ __u32 bm_free; /* Free blocks in here */
};
#define SF_INTL 0x0001 /* International filesystem. */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/affs_hardblocks.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/affs_hardblocks.h 2004-08-26 05:41:49.000000000 -0500
@@ -4,59 +4,59 @@
/* Just the needed definitions for the RDB of an Amiga HD. */
struct RigidDiskBlock {
- u32 rdb_ID;
- u32 rdb_SummedLongs;
- s32 rdb_ChkSum;
- u32 rdb_HostID;
- u32 rdb_BlockBytes;
- u32 rdb_Flags;
- u32 rdb_BadBlockList;
- u32 rdb_PartitionList;
- u32 rdb_FileSysHeaderList;
- u32 rdb_DriveInit;
- u32 rdb_Reserved1[6];
- u32 rdb_Cylinders;
- u32 rdb_Sectors;
- u32 rdb_Heads;
- u32 rdb_Interleave;
- u32 rdb_Park;
- u32 rdb_Reserved2[3];
- u32 rdb_WritePreComp;
- u32 rdb_ReducedWrite;
- u32 rdb_StepRate;
- u32 rdb_Reserved3[5];
- u32 rdb_RDBBlocksLo;
- u32 rdb_RDBBlocksHi;
- u32 rdb_LoCylinder;
- u32 rdb_HiCylinder;
- u32 rdb_CylBlocks;
- u32 rdb_AutoParkSeconds;
- u32 rdb_HighRDSKBlock;
- u32 rdb_Reserved4;
+ __u32 rdb_ID;
+ __u32 rdb_SummedLongs;
+ __s32 rdb_ChkSum;
+ __u32 rdb_HostID;
+ __u32 rdb_BlockBytes;
+ __u32 rdb_Flags;
+ __u32 rdb_BadBlockList;
+ __u32 rdb_PartitionList;
+ __u32 rdb_FileSysHeaderList;
+ __u32 rdb_DriveInit;
+ __u32 rdb_Reserved1[6];
+ __u32 rdb_Cylinders;
+ __u32 rdb_Sectors;
+ __u32 rdb_Heads;
+ __u32 rdb_Interleave;
+ __u32 rdb_Park;
+ __u32 rdb_Reserved2[3];
+ __u32 rdb_WritePreComp;
+ __u32 rdb_ReducedWrite;
+ __u32 rdb_StepRate;
+ __u32 rdb_Reserved3[5];
+ __u32 rdb_RDBBlocksLo;
+ __u32 rdb_RDBBlocksHi;
+ __u32 rdb_LoCylinder;
+ __u32 rdb_HiCylinder;
+ __u32 rdb_CylBlocks;
+ __u32 rdb_AutoParkSeconds;
+ __u32 rdb_HighRDSKBlock;
+ __u32 rdb_Reserved4;
char rdb_DiskVendor[8];
char rdb_DiskProduct[16];
char rdb_DiskRevision[4];
char rdb_ControllerVendor[8];
char rdb_ControllerProduct[16];
char rdb_ControllerRevision[4];
- u32 rdb_Reserved5[10];
+ __u32 rdb_Reserved5[10];
};
#define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */
struct PartitionBlock {
- u32 pb_ID;
- u32 pb_SummedLongs;
- s32 pb_ChkSum;
- u32 pb_HostID;
- u32 pb_Next;
- u32 pb_Flags;
- u32 pb_Reserved1[2];
- u32 pb_DevFlags;
- u8 pb_DriveName[32];
- u32 pb_Reserved2[15];
- u32 pb_Environment[17];
- u32 pb_EReserved[15];
+ __u32 pb_ID;
+ __u32 pb_SummedLongs;
+ __s32 pb_ChkSum;
+ __u32 pb_HostID;
+ __u32 pb_Next;
+ __u32 pb_Flags;
+ __u32 pb_Reserved1[2];
+ __u32 pb_DevFlags;
+ __u8 pb_DriveName[32];
+ __u32 pb_Reserved2[15];
+ __u32 pb_Environment[17];
+ __u32 pb_EReserved[15];
};
#define IDNAME_PARTITION 0x50415254 /* "PART" */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/amigaffs.h 2003-12-31 17:46:48.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/amigaffs.h 2004-08-26 05:41:49.000000000 -0500
@@ -64,90 +64,90 @@
#define AFFS_DATA(bh) (((struct affs_data_head *)(bh)->b_data)->data)
struct affs_date {
- u32 days;
- u32 mins;
- u32 ticks;
+ __u32 days;
+ __u32 mins;
+ __u32 ticks;
};
struct affs_short_date {
- u16 days;
- u16 mins;
- u16 ticks;
+ __u16 days;
+ __u16 mins;
+ __u16 ticks;
};
struct affs_root_head {
- u32 ptype;
- u32 spare1;
- u32 spare2;
- u32 hash_size;
- u32 spare3;
- u32 checksum;
- u32 hashtable[1];
+ __u32 ptype;
+ __u32 spare1;
+ __u32 spare2;
+ __u32 hash_size;
+ __u32 spare3;
+ __u32 checksum;
+ __u32 hashtable[1];
};
struct affs_root_tail {
- u32 bm_flag;
- u32 bm_blk[AFFS_ROOT_BMAPS];
- u32 bm_ext;
+ __u32 bm_flag;
+ __u32 bm_blk[AFFS_ROOT_BMAPS];
+ __u32 bm_ext;
struct affs_date root_change;
- u8 disk_name[32];
- u32 spare1;
- u32 spare2;
+ __u8 disk_name[32];
+ __u32 spare1;
+ __u32 spare2;
struct affs_date disk_change;
struct affs_date disk_create;
- u32 spare3;
- u32 spare4;
- u32 dcache;
- u32 stype;
+ __u32 spare3;
+ __u32 spare4;
+ __u32 dcache;
+ __u32 stype;
};
struct affs_head {
- u32 ptype;
- u32 key;
- u32 block_count;
- u32 spare1;
- u32 first_data;
- u32 checksum;
- u32 table[1];
+ __u32 ptype;
+ __u32 key;
+ __u32 block_count;
+ __u32 spare1;
+ __u32 first_data;
+ __u32 checksum;
+ __u32 table[1];
};
struct affs_tail {
- u32 spare1;
- u16 uid;
- u16 gid;
- u32 protect;
- u32 size;
- u8 comment[92];
+ __u32 spare1;
+ __u16 uid;
+ __u16 gid;
+ __u32 protect;
+ __u32 size;
+ __u8 comment[92];
struct affs_date change;
- u8 name[32];
- u32 spare2;
- u32 original;
- u32 link_chain;
- u32 spare[5];
- u32 hash_chain;
- u32 parent;
- u32 extension;
- u32 stype;
+ __u8 name[32];
+ __u32 spare2;
+ __u32 original;
+ __u32 link_chain;
+ __u32 spare[5];
+ __u32 hash_chain;
+ __u32 parent;
+ __u32 extension;
+ __u32 stype;
};
struct slink_front
{
- u32 ptype;
- u32 key;
- u32 spare1[3];
- u32 checksum;
- u8 symname[1]; /* depends on block size */
+ __u32 ptype;
+ __u32 key;
+ __u32 spare1[3];
+ __u32 checksum;
+ __u8 symname[1]; /* depends on block size */
};
struct affs_data_head
{
- u32 ptype;
- u32 key;
- u32 sequence;
- u32 size;
- u32 next;
- u32 checksum;
- u8 data[1]; /* depends on block size */
+ __u32 ptype;
+ __u32 key;
+ __u32 sequence;
+ __u32 size;
+ __u32 next;
+ __u32 checksum;
+ __u8 data[1]; /* depends on block size */
};
/* Permission bits */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/ata.h 2004-08-18 13:16:01.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/ata.h 2004-08-26 05:41:49.000000000 -0500
@@ -34,7 +34,7 @@
ATA_MAX_PRD = 256, /* we could make these 256/256 */
ATA_SECT_SIZE = 512,
ATA_SECT_SIZE_MASK = (ATA_SECT_SIZE - 1),
- ATA_SECT_DWORDS = ATA_SECT_SIZE / sizeof(u32),
+ ATA_SECT_DWORDS = ATA_SECT_SIZE / sizeof(__u32),
ATA_ID_WORDS = 256,
ATA_ID_PROD_OFS = 27,
@@ -176,31 +176,31 @@
/* core structures */
struct ata_prd {
- u32 addr;
- u32 flags_len;
+ __u32 addr;
+ __u32 flags_len;
} __attribute__((packed));
struct ata_taskfile {
unsigned long flags; /* ATA_TFLAG_xxx */
- u8 protocol; /* ATA_PROT_xxx */
+ __u8 protocol; /* ATA_PROT_xxx */
- u8 ctl; /* control reg */
+ __u8 ctl; /* control reg */
- u8 hob_feature; /* additional data */
- u8 hob_nsect; /* to support LBA48 */
- u8 hob_lbal;
- u8 hob_lbam;
- u8 hob_lbah;
+ __u8 hob_feature; /* additional data */
+ __u8 hob_nsect; /* to support LBA48 */
+ __u8 hob_lbal;
+ __u8 hob_lbam;
+ __u8 hob_lbah;
- u8 feature;
- u8 nsect;
- u8 lbal;
- u8 lbam;
- u8 lbah;
+ __u8 feature;
+ __u8 nsect;
+ __u8 lbal;
+ __u8 lbam;
+ __u8 lbah;
- u8 device;
+ __u8 device;
- u8 command; /* IO operation */
+ __u8 command; /* IO operation */
};
#define ata_id_is_ata(dev) (((dev)->id[0] & (1 << 15)) == 0)
@@ -213,12 +213,12 @@
#define ata_id_has_dma(dev) ((dev)->id[49] & (1 << 8))
#define ata_id_removeable(dev) ((dev)->id[0] & (1 << 7))
#define ata_id_u32(dev,n) \
- (((u32) (dev)->id[(n) + 1] << 16) | ((u32) (dev)->id[(n)]))
+ (((__u32) (dev)->id[(n) + 1] << 16) | ((__u32) (dev)->id[(n)]))
#define ata_id_u64(dev,n) \
- ( ((u64) dev->id[(n) + 3] << 48) | \
- ((u64) dev->id[(n) + 2] << 32) | \
- ((u64) dev->id[(n) + 1] << 16) | \
- ((u64) dev->id[(n) + 0]) )
+ ( ((__u64) dev->id[(n) + 3] << 48) | \
+ ((__u64) dev->id[(n) + 2] << 32) | \
+ ((__u64) dev->id[(n) + 1] << 16) | \
+ ((__u64) dev->id[(n) + 0]) )
static inline int is_atapi_taskfile(struct ata_taskfile *tf)
{
@@ -226,7 +226,7 @@
(tf->protocol == ATA_PROT_ATAPI_DMA);
}
-static inline int ata_ok(u8 status)
+static inline int ata_ok(__u8 status)
{
return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
== ATA_DRDY);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/bitops.h 2004-06-09 07:00:49.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/bitops.h 2004-08-26 05:41:49.000000000 -0500
@@ -114,7 +114,7 @@
return generic_hweight32((unsigned int)(w >> 32)) +
generic_hweight32((unsigned int)w);
#else
- u64 res;
+ __u64 res;
res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);
res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);
res = (res & 0x0F0F0F0F0F0F0F0Ful) + ((res >> 4) & 0x0F0F0F0F0F0F0F0Ful);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/compat.h 2004-06-09 07:00:49.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/compat.h 2004-08-26 05:41:49.000000000 -0500
@@ -78,9 +78,9 @@
};
struct compat_dirent {
- u32 d_ino;
+ __u32 d_ino;
compat_off_t d_off;
- u16 d_reclen;
+ __u16 d_reclen;
char d_name[256];
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/console.h 2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/console.h 2004-08-26 05:41:49.000000000 -0500
@@ -49,9 +49,9 @@
int (*con_scrolldelta)(struct vc_data *, int);
int (*con_set_origin)(struct vc_data *);
void (*con_save_screen)(struct vc_data *);
- u8 (*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8);
- void (*con_invert_region)(struct vc_data *, u16 *, int);
- u16 *(*con_screen_pos)(struct vc_data *, int);
+ __u8 (*con_build_attr)(struct vc_data *, __u8, __u8, __u8, __u8, __u8);
+ void (*con_invert_region)(struct vc_data *, __u16 *, int);
+ __u16 *(*con_screen_pos)(struct vc_data *, int);
unsigned long (*con_getxy)(struct vc_data *, unsigned long, int *, int *);
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/cpufreq.h 2004-06-23 16:52:53.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/cpufreq.h 2004-08-26 05:41:49.000000000 -0500
@@ -103,7 +103,7 @@
unsigned int cpu; /* cpu nr */
unsigned int old;
unsigned int new;
- u8 flags; /* flags of cpufreq_driver, see below. */
+ __u8 flags; /* flags of cpufreq_driver, see below. */
};
@@ -120,13 +120,13 @@
{
#if BITS_PER_LONG == 32
- u64 result = ((u64) old) * ((u64) mult);
+ __u64 result = ((__u64) old) * ((__u64) mult);
do_div(result, div);
return (unsigned long) result;
#elif BITS_PER_LONG == 64
- unsigned long result = old * ((u64) mult);
+ unsigned long result = old * ((__u64) mult);
result /= div;
return result;
@@ -178,7 +178,7 @@
struct cpufreq_driver {
struct module *owner;
char name[CPUFREQ_NAME_LEN];
- u8 flags;
+ __u8 flags;
/* needed by all drivers */
int (*init) (struct cpufreq_policy *policy);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/cramfs_fs.h 2004-01-05 12:42:27.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/cramfs_fs.h 2004-08-26 05:41:49.000000000 -0500
@@ -2,9 +2,9 @@
#define __CRAMFS_H
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
@@ -31,9 +31,9 @@
* Reasonably terse representation of the inode data.
*/
struct cramfs_inode {
- u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
+ __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
/* SIZE for device files is i_rdev */
- u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
+ __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
/* NAMELEN is the length of the file name, divided by 4 and
rounded up. (cramfs doesn't support hard links.) */
/* OFFSET: For symlinks and non-empty regular files, this
@@ -42,27 +42,27 @@
see README). For non-empty directories it is the offset
(divided by 4) of the inode of the first file in that
directory. For anything else, offset is zero. */
- u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
+ __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
};
struct cramfs_info {
- u32 crc;
- u32 edition;
- u32 blocks;
- u32 files;
+ __u32 crc;
+ __u32 edition;
+ __u32 blocks;
+ __u32 files;
};
/*
* Superblock information at the beginning of the FS.
*/
struct cramfs_super {
- u32 magic; /* 0x28cd3d45 - random number */
- u32 size; /* length in bytes */
- u32 flags; /* feature flags */
- u32 future; /* reserved for future use */
- u8 signature[16]; /* "Compressed ROMFS" */
+ __u32 magic; /* 0x28cd3d45 - random number */
+ __u32 size; /* length in bytes */
+ __u32 flags; /* feature flags */
+ __u32 future; /* reserved for future use */
+ __u8 signature[16]; /* "Compressed ROMFS" */
struct cramfs_info fsid; /* unique filesystem info */
- u8 name[16]; /* user-defined name */
+ __u8 name[16]; /* user-defined name */
struct cramfs_inode root; /* root inode data */
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/crc32.h 2003-12-15 12:46:57.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/crc32.h 2004-08-26 05:41:49.000000000 -0500
@@ -7,9 +7,9 @@
#include <linux/types.h>
-extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len);
-extern u32 crc32_be(u32 crc, unsigned char const *p, size_t len);
-extern u32 bitreverse(u32 in);
+extern __u32 crc32_le(__u32 crc, unsigned char const *p, size_t len);
+extern __u32 crc32_be(__u32 crc, unsigned char const *p, size_t len);
+extern __u32 bitreverse(__u32 in);
#define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)data, length)
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/crypto.h 2004-04-19 16:13:51.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/crypto.h 2004-08-26 05:41:49.000000000 -0500
@@ -63,28 +63,28 @@
struct cipher_alg {
unsigned int cia_min_keysize;
unsigned int cia_max_keysize;
- int (*cia_setkey)(void *ctx, const u8 *key,
- unsigned int keylen, u32 *flags);
- void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);
- void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);
+ int (*cia_setkey)(void *ctx, const __u8 *key,
+ unsigned int keylen, __u32 *flags);
+ void (*cia_encrypt)(void *ctx, __u8 *dst, const __u8 *src);
+ void (*cia_decrypt)(void *ctx, __u8 *dst, const __u8 *src);
};
struct digest_alg {
unsigned int dia_digestsize;
void (*dia_init)(void *ctx);
- void (*dia_update)(void *ctx, const u8 *data, unsigned int len);
- void (*dia_final)(void *ctx, u8 *out);
- int (*dia_setkey)(void *ctx, const u8 *key,
- unsigned int keylen, u32 *flags);
+ void (*dia_update)(void *ctx, const __u8 *data, unsigned int len);
+ void (*dia_final)(void *ctx, __u8 *out);
+ int (*dia_setkey)(void *ctx, const __u8 *key,
+ unsigned int keylen, __u32 *flags);
};
struct compress_alg {
int (*coa_init)(void *ctx);
void (*coa_exit)(void *ctx);
- int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
- int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ int (*coa_compress)(void *ctx, const __u8 *src, unsigned int slen,
+ __u8 *dst, unsigned int *dlen);
+ int (*coa_decompress)(void *ctx, const __u8 *src, unsigned int slen,
+ __u8 *dst, unsigned int *dlen);
};
#define cra_cipher cra_u.cipher
@@ -93,7 +93,7 @@
struct crypto_alg {
struct list_head cra_list;
- u32 cra_flags;
+ __u32 cra_flags;
unsigned int cra_blocksize;
unsigned int cra_ctxsize;
const char cra_name[CRYPTO_MAX_ALG_NAME];
@@ -116,7 +116,7 @@
/*
* Algorithm query interface.
*/
-int crypto_alg_available(const char *name, u32 flags);
+int crypto_alg_available(const char *name, __u32 flags);
/*
* Transforms: user-instantiated objects which encapsulate algorithms
@@ -128,9 +128,9 @@
struct cipher_tfm {
void *cit_iv;
unsigned int cit_ivsize;
- u32 cit_mode;
+ __u32 cit_mode;
int (*cit_setkey)(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen);
+ const __u8 *key, unsigned int keylen);
int (*cit_encrypt)(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
@@ -138,7 +138,7 @@
int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
- unsigned int nbytes, u8 *iv);
+ unsigned int nbytes, __u8 *iv);
int (*cit_decrypt)(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
@@ -146,19 +146,19 @@
int (*cit_decrypt_iv)(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
- unsigned int nbytes, u8 *iv);
- void (*cit_xor_block)(u8 *dst, const u8 *src);
+ unsigned int nbytes, __u8 *iv);
+ void (*cit_xor_block)(__u8 *dst, const __u8 *src);
};
struct digest_tfm {
void (*dit_init)(struct crypto_tfm *tfm);
void (*dit_update)(struct crypto_tfm *tfm,
struct scatterlist *sg, unsigned int nsg);
- void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
+ void (*dit_final)(struct crypto_tfm *tfm, __u8 *out);
void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
- unsigned int nsg, u8 *out);
+ unsigned int nsg, __u8 *out);
int (*dit_setkey)(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen);
+ const __u8 *key, unsigned int keylen);
#ifdef CONFIG_CRYPTO_HMAC
void *dit_hmac_block;
#endif
@@ -166,11 +166,11 @@
struct compress_tfm {
int (*cot_compress)(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ const __u8 *src, unsigned int slen,
+ __u8 *dst, unsigned int *dlen);
int (*cot_decompress)(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ const __u8 *src, unsigned int slen,
+ __u8 *dst, unsigned int *dlen);
};
#define crt_cipher crt_u.cipher
@@ -179,7 +179,7 @@
struct crypto_tfm {
- u32 crt_flags;
+ __u32 crt_flags;
union {
struct cipher_tfm cipher;
@@ -203,7 +203,7 @@
* crypto_free_tfm() frees up the transform and any associated resources,
* then drops the refcount on the associated algorithm.
*/
-struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags);
+struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, __u32 tfm_flags);
void crypto_free_tfm(struct crypto_tfm *tfm);
/*
@@ -219,7 +219,7 @@
return module_name(tfm->__crt_alg->cra_module);
}
-static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
+static inline __u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
{
return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
}
@@ -270,7 +270,7 @@
tfm->crt_digest.dit_update(tfm, sg, nsg);
}
-static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
+static inline void crypto_digest_final(struct crypto_tfm *tfm, __u8 *out)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
tfm->crt_digest.dit_final(tfm, out);
@@ -278,14 +278,14 @@
static inline void crypto_digest_digest(struct crypto_tfm *tfm,
struct scatterlist *sg,
- unsigned int nsg, u8 *out)
+ unsigned int nsg, __u8 *out)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
}
static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen)
+ const __u8 *key, unsigned int keylen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
if (tfm->crt_digest.dit_setkey == NULL)
@@ -294,7 +294,7 @@
}
static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen)
+ const __u8 *key, unsigned int keylen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
@@ -312,7 +312,7 @@
static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
- unsigned int nbytes, u8 *iv)
+ unsigned int nbytes, __u8 *iv)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -331,7 +331,7 @@
static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
- unsigned int nbytes, u8 *iv)
+ unsigned int nbytes, __u8 *iv)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -339,30 +339,30 @@
}
static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
- const u8 *src, unsigned int len)
+ const __u8 *src, unsigned int len)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
memcpy(tfm->crt_cipher.cit_iv, src, len);
}
static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
- u8 *dst, unsigned int len)
+ __u8 *dst, unsigned int len)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
memcpy(dst, tfm->crt_cipher.cit_iv, len);
}
static inline int crypto_comp_compress(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen)
+ const __u8 *src, unsigned int slen,
+ __u8 *dst, unsigned int *dlen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
}
static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen)
+ const __u8 *src, unsigned int slen,
+ __u8 *dst, unsigned int *dlen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
@@ -372,13 +372,13 @@
* HMAC support.
*/
#ifdef CONFIG_CRYPTO_HMAC
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
+void crypto_hmac_init(struct crypto_tfm *tfm, __u8 *key, unsigned int *keylen);
void crypto_hmac_update(struct crypto_tfm *tfm,
struct scatterlist *sg, unsigned int nsg);
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
- unsigned int *keylen, u8 *out);
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
- struct scatterlist *sg, unsigned int nsg, u8 *out);
+void crypto_hmac_final(struct crypto_tfm *tfm, __u8 *key,
+ unsigned int *keylen, __u8 *out);
+void crypto_hmac(struct crypto_tfm *tfm, __u8 *key, unsigned int *keylen,
+ struct scatterlist *sg, unsigned int nsg, __u8 *out);
#endif /* CONFIG_CRYPTO_HMAC */
#endif /* _LINUX_CRYPTO_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/cycx_drv.h 2003-12-15 12:46:57.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/cycx_drv.h 2004-08-26 05:41:49.000000000 -0500
@@ -14,9 +14,9 @@
* ============================================================================
* 1999/10/23 acme cycxhw_t cleanup
* 1999/01/03 acme more judicious use of data types...
-* uclong, ucchar, etc deleted, the u8, u16, u32
+* uclong, ucchar, etc deleted, the __u8, __u16, __u32
* types are the portable way to go.
-* 1999/01/03 acme judicious use of data types... u16, u32, etc
+* 1999/01/03 acme judicious use of data types... __u16, __u32, etc
* 1998/12/26 acme FIXED_BUFFERS, CONF_OFFSET,
* removal of cy_read{bwl}
* 1998/08/08 acme Initial version.
@@ -46,18 +46,18 @@
* @reserved - reserved for future use
*/
struct cycx_hw {
- u32 fwid;
+ __u32 fwid;
int irq;
void *dpmbase;
- u32 dpmsize;
- u32 reserved[5];
+ __u32 dpmsize;
+ __u32 reserved[5];
};
/* Function Prototypes */
-extern int cycx_setup(struct cycx_hw *hw, void *sfm, u32 len);
+extern int cycx_setup(struct cycx_hw *hw, void *sfm, __u32 len);
extern int cycx_down(struct cycx_hw *hw);
-extern int cycx_peek(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
-extern int cycx_poke(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
+extern int cycx_peek(struct cycx_hw *hw, __u32 addr, void *buf, __u32 len);
+extern int cycx_poke(struct cycx_hw *hw, __u32 addr, void *buf, __u32 len);
extern int cycx_exec(void *addr);
extern void cycx_inten(struct cycx_hw *hw);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/cycx_x25.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/cycx_x25.h 2004-08-26 05:41:49.000000000 -0500
@@ -38,10 +38,10 @@
/* Data Structures */
/* X.25 Command Block. */
struct cycx_x25_cmd {
- u16 command PACKED;
- u16 link PACKED; /* values: 0 or 1 */
- u16 len PACKED; /* values: 0 thru 0x205 (517) */
- u32 buf PACKED;
+ __u16 command PACKED;
+ __u16 link PACKED; /* values: 0 or 1 */
+ __u16 len PACKED; /* values: 0 thru 0x205 (517) */
+ __u32 buf PACKED;
};
/* Defines for the 'command' field. */
@@ -92,34 +92,34 @@
* @flags - see dosx25.doc, in portuguese, for details
*/
struct cycx_x25_config {
- u8 link PACKED;
- u8 speed PACKED;
- u8 clock PACKED;
- u8 n2 PACKED;
- u8 n2win PACKED;
- u8 n3win PACKED;
- u8 nvc PACKED;
- u8 pktlen PACKED;
- u8 locaddr PACKED;
- u8 remaddr PACKED;
- u16 t1 PACKED;
- u16 t2 PACKED;
- u8 t21 PACKED;
- u8 npvc PACKED;
- u8 t23 PACKED;
- u8 flags PACKED;
+ __u8 link PACKED;
+ __u8 speed PACKED;
+ __u8 clock PACKED;
+ __u8 n2 PACKED;
+ __u8 n2win PACKED;
+ __u8 n3win PACKED;
+ __u8 nvc PACKED;
+ __u8 pktlen PACKED;
+ __u8 locaddr PACKED;
+ __u8 remaddr PACKED;
+ __u16 t1 PACKED;
+ __u16 t2 PACKED;
+ __u8 t21 PACKED;
+ __u8 npvc PACKED;
+ __u8 t23 PACKED;
+ __u8 flags PACKED;
};
struct cycx_x25_stats {
- u16 rx_crc_errors PACKED;
- u16 rx_over_errors PACKED;
- u16 n2_tx_frames PACKED;
- u16 n2_rx_frames PACKED;
- u16 tx_timeouts PACKED;
- u16 rx_timeouts PACKED;
- u16 n3_tx_packets PACKED;
- u16 n3_rx_packets PACKED;
- u16 tx_aborts PACKED;
- u16 rx_aborts PACKED;
+ __u16 rx_crc_errors PACKED;
+ __u16 rx_over_errors PACKED;
+ __u16 n2_tx_frames PACKED;
+ __u16 n2_rx_frames PACKED;
+ __u16 tx_timeouts PACKED;
+ __u16 rx_timeouts PACKED;
+ __u16 n3_tx_packets PACKED;
+ __u16 n3_rx_packets PACKED;
+ __u16 tx_aborts PACKED;
+ __u16 rx_aborts PACKED;
};
#endif /* _CYCX_X25_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/device.h 2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/device.h 2004-08-26 05:41:49.000000000 -0500
@@ -57,7 +57,7 @@
struct device * (*add) (struct device * parent, char * bus_id);
int (*hotplug) (struct device *dev, char **envp,
int num_envp, char *buffer, int buffer_size);
- int (*suspend)(struct device * dev, u32 state);
+ int (*suspend)(struct device * dev, __u32 state);
int (*resume)(struct device * dev);
};
@@ -105,8 +105,8 @@
int (*probe) (struct device * dev);
int (*remove) (struct device * dev);
void (*shutdown) (struct device * dev);
- int (*suspend) (struct device * dev, u32 state, u32 level);
- int (*resume) (struct device * dev, u32 level);
+ int (*suspend) (struct device * dev, __u32 state, __u32 level);
+ int (*resume) (struct device * dev, __u32 level);
};
@@ -262,17 +262,17 @@
void *platform_data; /* Platform specific data (e.g. ACPI,
BIOS data relevant to device) */
struct dev_pm_info power;
- u32 power_state; /* Current operating state. In
+ __u32 power_state; /* Current operating state. In
ACPI-speak, this is D0-D3, D0
being fully functional, and D3
being off. */
unsigned char *saved_state; /* saved device state */
- u32 detach_state; /* State to enter when device is
+ __u32 detach_state; /* State to enter when device is
detached from its driver. */
- u64 *dma_mask; /* dma mask (if dma'able device) */
- u64 coherent_dma_mask;/* Like dma_mask, but for
+ __u64 *dma_mask; /* dma mask (if dma'able device) */
+ __u64 coherent_dma_mask;/* Like dma_mask, but for
alloc_coherent mappings as
not all hardware supports
64 bit addresses for consistent
@@ -360,9 +360,9 @@
struct platform_device {
char * name;
- u32 id;
+ __u32 id;
struct device dev;
- u32 num_resources;
+ __u32 num_resources;
struct resource * resource;
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/divert.h 2004-06-09 07:00:49.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/divert.h 2004-08-26 05:41:49.000000000 -0500
@@ -27,10 +27,10 @@
{
int divert; /* are we active */
unsigned int protos; /* protocols */
- u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
- u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
- u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
- u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
+ __u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
+ __u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
+ __u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
+ __u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
};
/*
@@ -40,12 +40,12 @@
typedef union _divert_cf_arg
{
- s16 int16;
- u16 uint16;
- s32 int32;
- u32 uint32;
- s64 int64;
- u64 uint64;
+ __s16 int16;
+ __u16 uint16;
+ __s32 int32;
+ __u32 uint32;
+ __s64 int64;
+ __u64 uint64;
void *ptr;
} divert_cf_arg;
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/eeprom.h 2003-12-19 07:05:15.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/eeprom.h 2004-08-26 13:26:38.000000000 -0500
@@ -26,15 +26,15 @@
unsigned ee_state;
spinlock_t *lock;
- u32 *cache;
+ __u32 *cache;
};
-u8 eeprom_readb(struct eeprom *ee, unsigned address);
-void eeprom_read(struct eeprom *ee, unsigned address, u8 *bytes,
+__u8 eeprom_readb(struct eeprom *ee, unsigned address);
+void eeprom_read(struct eeprom *ee, unsigned address, __u8 *bytes,
unsigned count);
-void eeprom_writeb(struct eeprom *ee, unsigned address, u8 data);
-void eeprom_write(struct eeprom *ee, unsigned address, u8 *bytes,
+void eeprom_writeb(struct eeprom *ee, unsigned address, __u8 data);
+void eeprom_write(struct eeprom *ee, unsigned address, __u8 *bytes,
unsigned count);
/* The EEPROM commands include the alway-set leading bit. */
@@ -56,10 +56,10 @@
}
/* foo. put this in a .c file */
-static inline void eeprom_update(struct eeprom *ee, u32 mask, int pol)
+static inline void eeprom_update(struct eeprom *ee, __u32 mask, int pol)
{
unsigned long flags;
- u32 data;
+ __u32 data;
spin_lock_irqsave(ee->lock, flags);
data = *ee->cache;
@@ -106,17 +106,17 @@
eeprom_update(ee, ee->eedi, pol);
}
-u16 eeprom_readw(struct eeprom *ee, unsigned address)
+__u16 eeprom_readw(struct eeprom *ee, unsigned address)
{
unsigned i;
- u16 res = 0;
+ __u16 res = 0;
eeprom_clk_lo(ee);
eeprom_update(ee, ee->eesel, 1 ^ !!(ee->polarity & EEPOL_EESEL));
eeprom_send_addr(ee, address);
for (i=0; i<16; i++) {
- u32 data;
+ __u32 data;
eeprom_clk_hi(ee);
res <<= 1;
data = readl(ee->addr);
@@ -130,6 +130,6 @@
}
-void eeprom_writeb(struct eeprom *ee, unsigned address, u8 data)
+void eeprom_writeb(struct eeprom *ee, unsigned address, __u8 data)
{
}
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/efi.h 2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/efi.h 2004-08-26 05:42:08.000000000 -0500
@@ -30,12 +30,12 @@
#define EFI_NOT_FOUND (14 | (1UL << (BITS_PER_LONG-1)))
typedef unsigned long efi_status_t;
-typedef u8 efi_bool_t;
-typedef u16 efi_char16_t; /* UNICODE character */
+typedef __u8 efi_bool_t;
+typedef __u16 efi_char16_t; /* UNICODE character */
typedef struct {
- u8 b[16];
+ __u8 b[16];
} efi_guid_t;
#define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
@@ -49,11 +49,11 @@
* Generic EFI table header
*/
typedef struct {
- u64 signature;
- u32 revision;
- u32 headersize;
- u32 crc32;
- u32 reserved;
+ __u64 signature;
+ __u32 revision;
+ __u32 headersize;
+ __u32 crc32;
+ __u32 reserved;
} efi_table_hdr_t;
/*
@@ -78,14 +78,14 @@
#define EFI_MAX_MEMORY_TYPE 14
/* Attribute values: */
-#define EFI_MEMORY_UC ((u64)0x0000000000000001ULL) /* uncached */
-#define EFI_MEMORY_WC ((u64)0x0000000000000002ULL) /* write-coalescing */
-#define EFI_MEMORY_WT ((u64)0x0000000000000004ULL) /* write-through */
-#define EFI_MEMORY_WB ((u64)0x0000000000000008ULL) /* write-back */
-#define EFI_MEMORY_WP ((u64)0x0000000000001000ULL) /* write-protect */
-#define EFI_MEMORY_RP ((u64)0x0000000000002000ULL) /* read-protect */
-#define EFI_MEMORY_XP ((u64)0x0000000000004000ULL) /* execute-protect */
-#define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */
+#define EFI_MEMORY_UC ((__u64)0x0000000000000001ULL) /* uncached */
+#define EFI_MEMORY_WC ((__u64)0x0000000000000002ULL) /* write-coalescing */
+#define EFI_MEMORY_WT ((__u64)0x0000000000000004ULL) /* write-through */
+#define EFI_MEMORY_WB ((__u64)0x0000000000000008ULL) /* write-back */
+#define EFI_MEMORY_WP ((__u64)0x0000000000001000ULL) /* write-protect */
+#define EFI_MEMORY_RP ((__u64)0x0000000000002000ULL) /* read-protect */
+#define EFI_MEMORY_XP ((__u64)0x0000000000004000ULL) /* execute-protect */
+#define EFI_MEMORY_RUNTIME ((__u64)0x8000000000000000ULL) /* range requires runtime mapping */
#define EFI_MEMORY_DESCRIPTOR_VERSION 1
#define EFI_PAGE_SHIFT 12
@@ -96,14 +96,14 @@
* the case in ia64. Need to have this fixed in the f/w.
*/
typedef struct {
- u32 type;
- u32 pad;
- u64 phys_addr;
- u64 virt_addr;
- u64 num_pages;
- u64 attribute;
+ __u32 type;
+ __u32 pad;
+ __u64 phys_addr;
+ __u64 virt_addr;
+ __u64 num_pages;
+ __u64 attribute;
#if defined (__i386__)
- u64 pad1;
+ __u64 pad1;
#endif
} efi_memory_desc_t;
@@ -117,23 +117,23 @@
#define EFI_UNSPECIFIED_TIMEZONE 0x07ff
typedef struct {
- u16 year;
- u8 month;
- u8 day;
- u8 hour;
- u8 minute;
- u8 second;
- u8 pad1;
- u32 nanosecond;
- s16 timezone;
- u8 daylight;
- u8 pad2;
+ __u16 year;
+ __u8 month;
+ __u8 day;
+ __u8 hour;
+ __u8 minute;
+ __u8 second;
+ __u8 pad1;
+ __u32 nanosecond;
+ __s16 timezone;
+ __u8 daylight;
+ __u8 pad2;
} efi_time_t;
typedef struct {
- u32 resolution;
- u32 accuracy;
- u8 sets_to_zero;
+ __u32 resolution;
+ __u32 accuracy;
+ __u8 sets_to_zero;
} efi_time_cap_t;
/*
@@ -146,7 +146,7 @@
/*
* EFI Runtime Services table
*/
-#define EFI_RUNTIME_SERVICES_SIGNATURE ((u64)0x5652453544e5552ULL)
+#define EFI_RUNTIME_SERVICES_SIGNATURE ((__u64)0x5652453544e5552ULL)
#define EFI_RUNTIME_SERVICES_REVISION 0x00010000
typedef struct {
@@ -169,19 +169,19 @@
typedef efi_status_t efi_get_wakeup_time_t (efi_bool_t *enabled, efi_bool_t *pending,
efi_time_t *tm);
typedef efi_status_t efi_set_wakeup_time_t (efi_bool_t enabled, efi_time_t *tm);
-typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, u32 *attr,
+typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, __u32 *attr,
unsigned long *data_size, void *data);
typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char16_t *name,
efi_guid_t *vendor);
typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor,
unsigned long attr, unsigned long data_size,
void *data);
-typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
+typedef efi_status_t efi_get_next_high_mono_count_t (__u32 *count);
typedef void efi_reset_system_t (int reset_type, efi_status_t status,
unsigned long data_size, efi_char16_t *data);
typedef efi_status_t efi_set_virtual_address_map_t (unsigned long memory_map_size,
unsigned long descriptor_size,
- u32 descriptor_version,
+ __u32 descriptor_version,
efi_memory_desc_t *virtual_map);
/*
@@ -219,13 +219,13 @@
unsigned long table;
} efi_config_table_t;
-#define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
+#define EFI_SYSTEM_TABLE_SIGNATURE ((__u64)0x5453595320494249ULL)
#define EFI_SYSTEM_TABLE_REVISION ((1 << 16) | 00)
typedef struct {
efi_table_hdr_t hdr;
unsigned long fw_vendor; /* physical addr of CHAR16 vendor string */
- u32 fw_revision;
+ __u32 fw_revision;
unsigned long con_in_handle;
unsigned long con_in;
unsigned long con_out_handle;
@@ -293,9 +293,9 @@
extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
extern void efi_gettimeofday (struct timespec *ts);
extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */
-extern u64 efi_get_iobase (void);
-extern u32 efi_mem_type (unsigned long phys_addr);
-extern u64 efi_mem_attributes (unsigned long phys_addr);
+extern __u64 efi_get_iobase (void);
+extern __u32 efi_mem_type (unsigned long phys_addr);
+extern __u64 efi_mem_attributes (unsigned long phys_addr);
extern int __init efi_uart_console_only (void);
extern void efi_initialize_iomem_resources(struct resource *code_resource,
struct resource *data_resource);
@@ -368,9 +368,9 @@
#define EFI_DEV_END_ENTIRE 0xFF
struct efi_generic_dev_path {
- u8 type;
- u8 sub_type;
- u16 length;
+ __u8 type;
+ __u8 sub_type;
+ __u16 length;
} __attribute ((packed));
#endif /* _LINUX_EFI_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/eisa.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/eisa.h 2004-08-26 05:42:08.000000000 -0500
@@ -43,7 +43,7 @@
int state;
unsigned long base_addr;
struct resource res[EISA_MAX_RESOURCES];
- u64 dma_mask;
+ __u64 dma_mask;
struct device dev; /* generic device */
#ifdef CONFIG_EISA_NAMES
char pretty_name[DEVICE_NAME_SIZE];
@@ -91,7 +91,7 @@
unsigned long bus_base_addr;
int slots; /* Max slot number */
int force_probe; /* Probe even when no slot 0 */
- u64 dma_mask; /* from bridge device */
+ __u64 dma_mask; /* from bridge device */
int bus_nr; /* Set by eisa_root_register */
struct resource eisa_root_res; /* ditto */
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/ethtool.h 2004-06-23 16:52:54.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/ethtool.h 2004-08-26 13:29:11.000000000 -0500
@@ -15,24 +15,24 @@
/* This should work for both 32 and 64 bit userland. */
struct ethtool_cmd {
- u32 cmd;
- u32 supported; /* Features this interface supports */
- u32 advertising; /* Features this interface advertises */
- u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
- u8 duplex; /* Duplex, half or full */
- u8 port; /* Which connector port */
- u8 phy_address;
- u8 transceiver; /* Which transceiver to use */
- u8 autoneg; /* Enable or disable autonegotiation */
- u32 maxtxpkt; /* Tx pkts before generating tx int */
- u32 maxrxpkt; /* Rx pkts before generating rx int */
- u32 reserved[4];
+ __u32 cmd;
+ __u32 supported; /* Features this interface supports */
+ __u32 advertising; /* Features this interface advertises */
+ __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
+ __u8 duplex; /* Duplex, half or full */
+ __u8 port; /* Which connector port */
+ __u8 phy_address;
+ __u8 transceiver; /* Which transceiver to use */
+ __u8 autoneg; /* Enable or disable autonegotiation */
+ __u32 maxtxpkt; /* Tx pkts before generating tx int */
+ __u32 maxrxpkt; /* Rx pkts before generating rx int */
+ __u32 reserved[4];
};
#define ETHTOOL_BUSINFO_LEN 32
/* these strings are set to whatever the driver author decides... */
struct ethtool_drvinfo {
- u32 cmd;
+ __u32 cmd;
char driver[32]; /* driver short name, "tulip", "eepro100" */
char version[32]; /* driver version string */
char fw_version[32]; /* firmware version string, if applicable */
@@ -40,53 +40,53 @@
/* For PCI devices, use pci_name(pci_dev). */
char reserved1[32];
char reserved2[16];
- u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
- u32 testinfo_len;
- u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
- u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
+ __u32 n_stats; /* number of __u64's from ETHTOOL_GSTATS */
+ __u32 testinfo_len;
+ __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
+ __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
};
#define SOPASS_MAX 6
/* wake-on-lan settings */
struct ethtool_wolinfo {
- u32 cmd;
- u32 supported;
- u32 wolopts;
- u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
+ __u32 cmd;
+ __u32 supported;
+ __u32 wolopts;
+ __u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
};
/* for passing single values */
struct ethtool_value {
- u32 cmd;
- u32 data;
+ __u32 cmd;
+ __u32 data;
};
/* for passing big chunks of data */
struct ethtool_regs {
- u32 cmd;
- u32 version; /* driver-specific, indicates different chips/revs */
- u32 len; /* bytes */
- u8 data[0];
+ __u32 cmd;
+ __u32 version; /* driver-specific, indicates different chips/revs */
+ __u32 len; /* bytes */
+ __u8 data[0];
};
/* for passing EEPROM chunks */
struct ethtool_eeprom {
- u32 cmd;
- u32 magic;
- u32 offset; /* in bytes */
- u32 len; /* in bytes */
- u8 data[0];
+ __u32 cmd;
+ __u32 magic;
+ __u32 offset; /* in bytes */
+ __u32 len; /* in bytes */
+ __u8 data[0];
};
/* for configuring coalescing parameters of chip */
struct ethtool_coalesce {
- u32 cmd; /* ETHTOOL_{G,S}COALESCE */
+ __u32 cmd; /* ETHTOOL_{G,S}COALESCE */
/* How many usecs to delay an RX interrupt after
* a packet arrives. If 0, only rx_max_coalesced_frames
* is used.
*/
- u32 rx_coalesce_usecs;
+ __u32 rx_coalesce_usecs;
/* How many packets to delay an RX interrupt after
* a packet arrives. If 0, only rx_coalesce_usecs is
@@ -94,21 +94,21 @@
* to zero as this would cause RX interrupts to never be
* generated.
*/
- u32 rx_max_coalesced_frames;
+ __u32 rx_max_coalesced_frames;
/* Same as above two parameters, except that these values
* apply while an IRQ is being serviced by the host. Not
* all cards support this feature and the values are ignored
* in that case.
*/
- u32 rx_coalesce_usecs_irq;
- u32 rx_max_coalesced_frames_irq;
+ __u32 rx_coalesce_usecs_irq;
+ __u32 rx_max_coalesced_frames_irq;
/* How many usecs to delay a TX interrupt after
* a packet is sent. If 0, only tx_max_coalesced_frames
* is used.
*/
- u32 tx_coalesce_usecs;
+ __u32 tx_coalesce_usecs;
/* How many packets to delay a TX interrupt after
* a packet is sent. If 0, only tx_coalesce_usecs is
@@ -116,22 +116,22 @@
* to zero as this would cause TX interrupts to never be
* generated.
*/
- u32 tx_max_coalesced_frames;
+ __u32 tx_max_coalesced_frames;
/* Same as above two parameters, except that these values
* apply while an IRQ is being serviced by the host. Not
* all cards support this feature and the values are ignored
* in that case.
*/
- u32 tx_coalesce_usecs_irq;
- u32 tx_max_coalesced_frames_irq;
+ __u32 tx_coalesce_usecs_irq;
+ __u32 tx_max_coalesced_frames_irq;
/* How many usecs to delay in-memory statistics
* block updates. Some drivers do not have an in-memory
* statistic block, and in such cases this value is ignored.
* This value must not be zero.
*/
- u32 stats_block_coalesce_usecs;
+ __u32 stats_block_coalesce_usecs;
/* Adaptive RX/TX coalescing is an algorithm implemented by
* some drivers to improve latency under low packet rates and
@@ -140,18 +140,18 @@
* not implemented by the driver causes these values to be
* silently ignored.
*/
- u32 use_adaptive_rx_coalesce;
- u32 use_adaptive_tx_coalesce;
+ __u32 use_adaptive_rx_coalesce;
+ __u32 use_adaptive_tx_coalesce;
/* When the packet rate (measured in packets per second)
* is below pkt_rate_low, the {rx,tx}_*_low parameters are
* used.
*/
- u32 pkt_rate_low;
- u32 rx_coalesce_usecs_low;
- u32 rx_max_coalesced_frames_low;
- u32 tx_coalesce_usecs_low;
- u32 tx_max_coalesced_frames_low;
+ __u32 pkt_rate_low;
+ __u32 rx_coalesce_usecs_low;
+ __u32 rx_max_coalesced_frames_low;
+ __u32 tx_coalesce_usecs_low;
+ __u32 tx_max_coalesced_frames_low;
/* When the packet rate is below pkt_rate_high but above
* pkt_rate_low (both measured in packets per second) the
@@ -162,43 +162,43 @@
* is above pkt_rate_high, the {rx,tx}_*_high parameters are
* used.
*/
- u32 pkt_rate_high;
- u32 rx_coalesce_usecs_high;
- u32 rx_max_coalesced_frames_high;
- u32 tx_coalesce_usecs_high;
- u32 tx_max_coalesced_frames_high;
+ __u32 pkt_rate_high;
+ __u32 rx_coalesce_usecs_high;
+ __u32 rx_max_coalesced_frames_high;
+ __u32 tx_coalesce_usecs_high;
+ __u32 tx_max_coalesced_frames_high;
/* How often to do adaptive coalescing packet rate sampling,
* measured in seconds. Must not be zero.
*/
- u32 rate_sample_interval;
+ __u32 rate_sample_interval;
};
/* for configuring RX/TX ring parameters */
struct ethtool_ringparam {
- u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */
+ __u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */
/* Read only attributes. These indicate the maximum number
* of pending RX/TX ring entries the driver will allow the
* user to set.
*/
- u32 rx_max_pending;
- u32 rx_mini_max_pending;
- u32 rx_jumbo_max_pending;
- u32 tx_max_pending;
+ __u32 rx_max_pending;
+ __u32 rx_mini_max_pending;
+ __u32 rx_jumbo_max_pending;
+ __u32 tx_max_pending;
/* Values changeable by the user. The valid values are
* in the range 1 to the "*_max_pending" counterpart above.
*/
- u32 rx_pending;
- u32 rx_mini_pending;
- u32 rx_jumbo_pending;
- u32 tx_pending;
+ __u32 rx_pending;
+ __u32 rx_mini_pending;
+ __u32 rx_jumbo_pending;
+ __u32 tx_pending;
};
/* for configuring link flow control parameters */
struct ethtool_pauseparam {
- u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */
+ __u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */
/* If the link is being auto-negotiated (via ethtool_cmd.autoneg
* being true) the user may set 'autonet' here non-zero to have the
@@ -210,9 +210,9 @@
* then {rx,tx}_pause force the driver to use/not-use pause
* flow control.
*/
- u32 autoneg;
- u32 rx_pause;
- u32 tx_pause;
+ __u32 autoneg;
+ __u32 rx_pause;
+ __u32 tx_pause;
};
#define ETH_GSTRING_LEN 32
@@ -223,10 +223,10 @@
/* for passing string sets for data tagging */
struct ethtool_gstrings {
- u32 cmd; /* ETHTOOL_GSTRINGS */
- u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/
- u32 len; /* number of strings in the string set */
- u8 data[0];
+ __u32 cmd; /* ETHTOOL_GSTRINGS */
+ __u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/
+ __u32 len; /* number of strings in the string set */
+ __u8 data[0];
};
enum ethtool_test_flags {
@@ -236,30 +236,30 @@
/* for requesting NIC test and getting results*/
struct ethtool_test {
- u32 cmd; /* ETHTOOL_TEST */
- u32 flags; /* ETH_TEST_FL_xxx */
- u32 reserved;
- u32 len; /* result length, in number of u64 elements */
- u64 data[0];
+ __u32 cmd; /* ETHTOOL_TEST */
+ __u32 flags; /* ETH_TEST_FL_xxx */
+ __u32 reserved;
+ __u32 len; /* result length, in number of __u64 elements */
+ __u64 data[0];
};
/* for dumping NIC-specific statistics */
struct ethtool_stats {
- u32 cmd; /* ETHTOOL_GSTATS */
- u32 n_stats; /* number of u64's being returned */
- u64 data[0];
+ __u32 cmd; /* ETHTOOL_GSTATS */
+ __u32 n_stats; /* number of __u64's being returned */
+ __u64 data[0];
};
struct net_device;
/* Some generic methods drivers may use in their ethtool_ops */
-u32 ethtool_op_get_link(struct net_device *dev);
-u32 ethtool_op_get_tx_csum(struct net_device *dev);
-int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
-u32 ethtool_op_get_sg(struct net_device *dev);
-int ethtool_op_set_sg(struct net_device *dev, u32 data);
-u32 ethtool_op_get_tso(struct net_device *dev);
-int ethtool_op_set_tso(struct net_device *dev, u32 data);
+__u32 ethtool_op_get_link(struct net_device *dev);
+__u32 ethtool_op_get_tx_csum(struct net_device *dev);
+int ethtool_op_set_tx_csum(struct net_device *dev, __u32 data);
+__u32 ethtool_op_get_sg(struct net_device *dev);
+int ethtool_op_set_sg(struct net_device *dev, __u32 data);
+__u32 ethtool_op_get_tso(struct net_device *dev);
+int ethtool_op_set_tso(struct net_device *dev, __u32 data);
/**
* &ethtool_ops - Alter and report network device settings
@@ -324,33 +324,33 @@
void (*get_regs)(struct net_device *, struct ethtool_regs *, void *);
void (*get_wol)(struct net_device *, struct ethtool_wolinfo *);
int (*set_wol)(struct net_device *, struct ethtool_wolinfo *);
- u32 (*get_msglevel)(struct net_device *);
- void (*set_msglevel)(struct net_device *, u32);
+ __u32 (*get_msglevel)(struct net_device *);
+ void (*set_msglevel)(struct net_device *, __u32);
int (*nway_reset)(struct net_device *);
- u32 (*get_link)(struct net_device *);
+ __u32 (*get_link)(struct net_device *);
int (*get_eeprom_len)(struct net_device *);
- int (*get_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
- int (*set_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
+ int (*get_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
+ int (*set_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
int (*get_coalesce)(struct net_device *, struct ethtool_coalesce *);
int (*set_coalesce)(struct net_device *, struct ethtool_coalesce *);
void (*get_ringparam)(struct net_device *, struct ethtool_ringparam *);
int (*set_ringparam)(struct net_device *, struct ethtool_ringparam *);
void (*get_pauseparam)(struct net_device *, struct ethtool_pauseparam*);
int (*set_pauseparam)(struct net_device *, struct ethtool_pauseparam*);
- u32 (*get_rx_csum)(struct net_device *);
- int (*set_rx_csum)(struct net_device *, u32);
- u32 (*get_tx_csum)(struct net_device *);
- int (*set_tx_csum)(struct net_device *, u32);
- u32 (*get_sg)(struct net_device *);
- int (*set_sg)(struct net_device *, u32);
- u32 (*get_tso)(struct net_device *);
- int (*set_tso)(struct net_device *, u32);
+ __u32 (*get_rx_csum)(struct net_device *);
+ int (*set_rx_csum)(struct net_device *, __u32);
+ __u32 (*get_tx_csum)(struct net_device *);
+ int (*set_tx_csum)(struct net_device *, __u32);
+ __u32 (*get_sg)(struct net_device *);
+ int (*set_sg)(struct net_device *, __u32);
+ __u32 (*get_tso)(struct net_device *);
+ int (*set_tso)(struct net_device *, __u32);
int (*self_test_count)(struct net_device *);
- void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
- void (*get_strings)(struct net_device *, u32 stringset, u8 *);
- int (*phys_id)(struct net_device *, u32);
+ void (*self_test)(struct net_device *, struct ethtool_test *, __u64 *);
+ void (*get_strings)(struct net_device *, __u32 stringset, __u8 *);
+ int (*phys_id)(struct net_device *, __u32);
int (*get_stats_count)(struct net_device *);
- void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
+ void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, __u64 *);
int (*begin)(struct net_device *);
void (*complete)(struct net_device *);
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/firmware.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/firmware.h 2004-08-26 05:42:08.000000000 -0500
@@ -5,7 +5,7 @@
#define FIRMWARE_NAME_MAX 30
struct firmware {
size_t size;
- u8 *data;
+ __u8 *data;
};
int request_firmware(const struct firmware **fw, const char *name,
struct device *device);
@@ -15,5 +15,5 @@
void (*cont)(const struct firmware *fw, void *context));
void release_firmware(const struct firmware *fw);
-void register_firmware(const char *name, const u8 *data, size_t size);
+void register_firmware(const char *name, const __u8 *data, size_t size);
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/fs.h 2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/fs.h 2004-08-26 05:42:08.000000000 -0500
@@ -198,7 +198,7 @@
/* A jump here: 108-111 have been used for various private purposes. */
#define BLKBSZGET _IOR(0x12,112,size_t)
#define BLKBSZSET _IOW(0x12,113,size_t)
-#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (u64 *arg) */
+#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (__u64 *arg) */
#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */
#define FIBMAP _IO(0x00,1) /* bmap access */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/i2c.h 2004-06-23 16:52:54.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/i2c.h 2004-08-26 05:42:08.000000000 -0500
@@ -70,36 +70,36 @@
and probably just as fast.
Note that we use i2c_adapter here, because you do not need a specific
smbus adapter to call this function. */
-extern s32 i2c_smbus_xfer (struct i2c_adapter * adapter, u16 addr,
+extern __s32 i2c_smbus_xfer (struct i2c_adapter * adapter, __u16 addr,
unsigned short flags,
- char read_write, u8 command, int size,
+ char read_write, __u8 command, int size,
union i2c_smbus_data * data);
/* Now follow the 'nice' access routines. These also document the calling
conventions of smbus_access. */
-extern s32 i2c_smbus_write_quick(struct i2c_client * client, u8 value);
-extern s32 i2c_smbus_read_byte(struct i2c_client * client);
-extern s32 i2c_smbus_write_byte(struct i2c_client * client, u8 value);
-extern s32 i2c_smbus_read_byte_data(struct i2c_client * client, u8 command);
-extern s32 i2c_smbus_write_byte_data(struct i2c_client * client,
- u8 command, u8 value);
-extern s32 i2c_smbus_read_word_data(struct i2c_client * client, u8 command);
-extern s32 i2c_smbus_write_word_data(struct i2c_client * client,
- u8 command, u16 value);
-extern s32 i2c_smbus_process_call(struct i2c_client * client,
- u8 command, u16 value);
+extern __s32 i2c_smbus_write_quick(struct i2c_client * client, __u8 value);
+extern __s32 i2c_smbus_read_byte(struct i2c_client * client);
+extern __s32 i2c_smbus_write_byte(struct i2c_client * client, __u8 value);
+extern __s32 i2c_smbus_read_byte_data(struct i2c_client * client, __u8 command);
+extern __s32 i2c_smbus_write_byte_data(struct i2c_client * client,
+ __u8 command, __u8 value);
+extern __s32 i2c_smbus_read_word_data(struct i2c_client * client, __u8 command);
+extern __s32 i2c_smbus_write_word_data(struct i2c_client * client,
+ __u8 command, __u16 value);
+extern __s32 i2c_smbus_process_call(struct i2c_client * client,
+ __u8 command, __u16 value);
/* Returns the number of read bytes */
-extern s32 i2c_smbus_read_block_data(struct i2c_client * client,
- u8 command, u8 *values);
-extern s32 i2c_smbus_write_block_data(struct i2c_client * client,
- u8 command, u8 length,
- u8 *values);
-extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
- u8 command, u8 *values);
-extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
- u8 command, u8 length,
- u8 *values);
+extern __s32 i2c_smbus_read_block_data(struct i2c_client * client,
+ __u8 command, __u8 *values);
+extern __s32 i2c_smbus_write_block_data(struct i2c_client * client,
+ __u8 command, __u8 length,
+ __u8 *values);
+extern __s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
+ __u8 command, __u8 *values);
+extern __s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
+ __u8 command, __u8 length,
+ __u8 *values);
/*
@@ -203,9 +203,9 @@
using common I2C messages */
int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[],
int num);
- int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,
+ int (*smbus_xfer) (struct i2c_adapter *adap, __u16 addr,
unsigned short flags, char read_write,
- u8 command, int size, union i2c_smbus_data * data);
+ __u8 command, int size, union i2c_smbus_data * data);
/* --- these optional/future use for some adapter types.*/
int (*slave_send)(struct i2c_adapter *,char*,int);
@@ -215,7 +215,7 @@
int (*algo_control)(struct i2c_adapter *, unsigned int, unsigned long);
/* To determine what the adapter supports */
- u32 (*functionality) (struct i2c_adapter *);
+ __u32 (*functionality) (struct i2c_adapter *);
};
/*
@@ -381,10 +381,10 @@
/* Return the functionality mask */
-extern u32 i2c_get_functionality (struct i2c_adapter *adap);
+extern __u32 i2c_get_functionality (struct i2c_adapter *adap);
/* Return 1 if adapter supports everything we need, 0 if not. */
-extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
+extern int i2c_check_functionality (struct i2c_adapter *adap, __u32 func);
/*
* I2C Message - used for pure i2c transaction, also from /dev interface
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/i2o-dev.h 2004-06-23 16:52:54.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/i2o-dev.h 2004-08-26 05:42:08.000000000 -0500
@@ -29,7 +29,7 @@
* I2O Control IOCTLs and structures
*/
#define I2O_MAGIC_NUMBER 'i'
-#define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,u8[MAX_I2O_CONTROLLERS])
+#define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,__u8[MAX_I2O_CONTROLLERS])
#define I2OHRTGET _IOWR(I2O_MAGIC_NUMBER,1,struct i2o_cmd_hrtlct)
#define I2OLCTGET _IOWR(I2O_MAGIC_NUMBER,2,struct i2o_cmd_hrtlct)
#define I2OPARMSET _IOWR(I2O_MAGIC_NUMBER,3,struct i2o_cmd_psetget)
@@ -37,7 +37,7 @@
#define I2OSWDL _IOWR(I2O_MAGIC_NUMBER,5,struct i2o_sw_xfer)
#define I2OSWUL _IOWR(I2O_MAGIC_NUMBER,6,struct i2o_sw_xfer)
#define I2OSWDEL _IOWR(I2O_MAGIC_NUMBER,7,struct i2o_sw_xfer)
-#define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,u32)
+#define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,__u32)
#define I2OHTML _IOWR(I2O_MAGIC_NUMBER,9,struct i2o_html)
#define I2OEVTREG _IOW(I2O_MAGIC_NUMBER,10,struct i2o_evt_id)
#define I2OEVTGET _IOR(I2O_MAGIC_NUMBER,11,struct i2o_evt_info)
@@ -129,65 +129,65 @@
#define I2O_BUS_CARDBUS 7
#define I2O_BUS_UNKNOWN 0x80
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
typedef struct _i2o_pci_bus
{
- u8 PciFunctionNumber;
- u8 PciDeviceNumber;
- u8 PciBusNumber;
- u8 reserved;
- u16 PciVendorID;
- u16 PciDeviceID;
+ __u8 PciFunctionNumber;
+ __u8 PciDeviceNumber;
+ __u8 PciBusNumber;
+ __u8 reserved;
+ __u16 PciVendorID;
+ __u16 PciDeviceID;
} i2o_pci_bus;
typedef struct _i2o_local_bus
{
- u16 LbBaseIOPort;
- u16 reserved;
- u32 LbBaseMemoryAddress;
+ __u16 LbBaseIOPort;
+ __u16 reserved;
+ __u32 LbBaseMemoryAddress;
} i2o_local_bus;
typedef struct _i2o_isa_bus
{
- u16 IsaBaseIOPort;
- u8 CSN;
- u8 reserved;
- u32 IsaBaseMemoryAddress;
+ __u16 IsaBaseIOPort;
+ __u8 CSN;
+ __u8 reserved;
+ __u32 IsaBaseMemoryAddress;
} i2o_isa_bus;
typedef struct _i2o_eisa_bus_info
{
- u16 EisaBaseIOPort;
- u8 reserved;
- u8 EisaSlotNumber;
- u32 EisaBaseMemoryAddress;
+ __u16 EisaBaseIOPort;
+ __u8 reserved;
+ __u8 EisaSlotNumber;
+ __u32 EisaBaseMemoryAddress;
} i2o_eisa_bus;
typedef struct _i2o_mca_bus
{
- u16 McaBaseIOPort;
- u8 reserved;
- u8 McaSlotNumber;
- u32 McaBaseMemoryAddress;
+ __u16 McaBaseIOPort;
+ __u8 reserved;
+ __u8 McaSlotNumber;
+ __u32 McaBaseMemoryAddress;
} i2o_mca_bus;
typedef struct _i2o_other_bus
{
- u16 BaseIOPort;
- u16 reserved;
- u32 BaseMemoryAddress;
+ __u16 BaseIOPort;
+ __u16 reserved;
+ __u32 BaseMemoryAddress;
} i2o_other_bus;
typedef struct _i2o_hrt_entry
{
- u32 adapter_id;
- u32 parent_tid:12;
- u32 state:4;
- u32 bus_num:8;
- u32 bus_type:8;
+ __u32 adapter_id;
+ __u32 parent_tid:12;
+ __u32 state:4;
+ __u32 bus_num:8;
+ __u32 bus_type:8;
union
{
i2o_pci_bus pci_bus;
@@ -201,69 +201,69 @@
typedef struct _i2o_hrt
{
- u16 num_entries;
- u8 entry_len;
- u8 hrt_version;
- u32 change_ind;
+ __u16 num_entries;
+ __u8 entry_len;
+ __u8 hrt_version;
+ __u32 change_ind;
i2o_hrt_entry hrt_entry[1];
} i2o_hrt;
typedef struct _i2o_lct_entry
{
- u32 entry_size:16;
- u32 tid:12;
- u32 reserved:4;
- u32 change_ind;
- u32 device_flags;
- u32 class_id:12;
- u32 version:4;
- u32 vendor_id:16;
- u32 sub_class;
- u32 user_tid:12;
- u32 parent_tid:12;
- u32 bios_info:8;
- u8 identity_tag[8];
- u32 event_capabilities;
+ __u32 entry_size:16;
+ __u32 tid:12;
+ __u32 reserved:4;
+ __u32 change_ind;
+ __u32 device_flags;
+ __u32 class_id:12;
+ __u32 version:4;
+ __u32 vendor_id:16;
+ __u32 sub_class;
+ __u32 user_tid:12;
+ __u32 parent_tid:12;
+ __u32 bios_info:8;
+ __u8 identity_tag[8];
+ __u32 event_capabilities;
} i2o_lct_entry;
typedef struct _i2o_lct
{
- u32 table_size:16;
- u32 boot_tid:12;
- u32 lct_ver:4;
- u32 iop_flags;
- u32 change_ind;
+ __u32 table_size:16;
+ __u32 boot_tid:12;
+ __u32 lct_ver:4;
+ __u32 iop_flags;
+ __u32 change_ind;
i2o_lct_entry lct_entry[1];
} i2o_lct;
typedef struct _i2o_status_block
{
- u16 org_id;
- u16 reserved;
- u16 iop_id:12;
- u16 reserved1:4;
- u16 host_unit_id;
- u16 segment_number:12;
- u16 i2o_version:4;
- u8 iop_state;
- u8 msg_type;
- u16 inbound_frame_size;
- u8 init_code;
- u8 reserved2;
- u32 max_inbound_frames;
- u32 cur_inbound_frames;
- u32 max_outbound_frames;
+ __u16 org_id;
+ __u16 reserved;
+ __u16 iop_id:12;
+ __u16 reserved1:4;
+ __u16 host_unit_id;
+ __u16 segment_number:12;
+ __u16 i2o_version:4;
+ __u8 iop_state;
+ __u8 msg_type;
+ __u16 inbound_frame_size;
+ __u8 init_code;
+ __u8 reserved2;
+ __u32 max_inbound_frames;
+ __u32 cur_inbound_frames;
+ __u32 max_outbound_frames;
char product_id[24];
- u32 expected_lct_size;
- u32 iop_capabilities;
- u32 desired_mem_size;
- u32 current_mem_size;
- u32 current_mem_base;
- u32 desired_io_size;
- u32 current_io_size;
- u32 current_io_base;
- u32 reserved3:24;
- u32 cmd_status:8;
+ __u32 expected_lct_size;
+ __u32 iop_capabilities;
+ __u32 desired_mem_size;
+ __u32 current_mem_size;
+ __u32 current_mem_base;
+ __u32 desired_io_size;
+ __u32 current_io_size;
+ __u32 current_io_base;
+ __u32 reserved3:24;
+ __u32 cmd_status:8;
} i2o_status_block;
/* Event indicator mask flags */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/isdn/capilli.h 2004-03-28 07:52:12.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/isdn/capilli.h 2004-08-26 13:26:47.000000000 -0500
@@ -43,20 +43,20 @@
char *driver_name; /* name of driver */
int (*load_firmware)(struct capi_ctr *, capiloaddata *);
void (*reset_ctr)(struct capi_ctr *);
- void (*register_appl)(struct capi_ctr *, u16 appl,
+ void (*register_appl)(struct capi_ctr *, __u16 appl,
capi_register_params *);
- void (*release_appl)(struct capi_ctr *, u16 appl);
- u16 (*send_message)(struct capi_ctr *, struct sk_buff *skb);
+ void (*release_appl)(struct capi_ctr *, __u16 appl);
+ __u16 (*send_message)(struct capi_ctr *, struct sk_buff *skb);
char *(*procinfo)(struct capi_ctr *);
int (*ctr_read_proc)(char *page, char **start, off_t off,
int count, int *eof, struct capi_ctr *card);
/* filled in before calling ready callback */
- u8 manu[CAPI_MANUFACTURER_LEN]; /* CAPI_GET_MANUFACTURER */
+ __u8 manu[CAPI_MANUFACTURER_LEN]; /* CAPI_GET_MANUFACTURER */
capi_version version; /* CAPI_GET_VERSION */
capi_profile profile; /* CAPI_GET_PROFILE */
- u8 serial[CAPI_SERIAL_LEN]; /* CAPI_GET_SERIAL */
+ __u8 serial[CAPI_SERIAL_LEN]; /* CAPI_GET_SERIAL */
/* management information for kcapi */
@@ -81,7 +81,7 @@
void capi_ctr_reseted(struct capi_ctr * card);
void capi_ctr_suspend_output(struct capi_ctr * card);
void capi_ctr_resume_output(struct capi_ctr * card);
-void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb);
+void capi_ctr_handle_message(struct capi_ctr * card, __u16 appl, struct sk_buff *skb);
// ---------------------------------------------------------------------------
// needed for AVM capi drivers
@@ -102,11 +102,11 @@
// ---------------------------------------------------------------------------
// library functions for use by hardware controller drivers
-void capilib_new_ncci(struct list_head *head, u16 applid, u32 ncci, u32 winsize);
-void capilib_free_ncci(struct list_head *head, u16 applid, u32 ncci);
-void capilib_release_appl(struct list_head *head, u16 applid);
+void capilib_new_ncci(struct list_head *head, __u16 applid, __u32 ncci, __u32 winsize);
+void capilib_free_ncci(struct list_head *head, __u16 applid, __u32 ncci);
+void capilib_release_appl(struct list_head *head, __u16 applid);
void capilib_release(struct list_head *head);
-void capilib_data_b3_conf(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
-u16 capilib_data_b3_req(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
+void capilib_data_b3_conf(struct list_head *head, __u16 applid, __u32 ncci, __u16 msgid);
+__u16 capilib_data_b3_req(struct list_head *head, __u16 applid, __u32 ncci, __u16 msgid);
#endif /* __CAPILLI_H__ */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/jhash.h 2004-03-28 07:52:09.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/jhash.h 2004-08-26 05:42:08.000000000 -0500
@@ -41,19 +41,19 @@
* of bytes. No alignment or length assumptions are made about
* the input key.
*/
-static inline u32 jhash(const void *key, u32 length, u32 initval)
+static inline __u32 jhash(const void *key, __u32 length, __u32 initval)
{
- u32 a, b, c, len;
- const u8 *k = key;
+ __u32 a, b, c, len;
+ const __u8 *k = key;
len = length;
a = b = JHASH_GOLDEN_RATIO;
c = initval;
while (len >= 12) {
- a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
- b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
- c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
+ a += (k[0] +((__u32)k[1]<<8) +((__u32)k[2]<<16) +((__u32)k[3]<<24));
+ b += (k[4] +((__u32)k[5]<<8) +((__u32)k[6]<<16) +((__u32)k[7]<<24));
+ c += (k[8] +((__u32)k[9]<<8) +((__u32)k[10]<<16)+((__u32)k[11]<<24));
__jhash_mix(a,b,c);
@@ -63,16 +63,16 @@
c += length;
switch (len) {
- case 11: c += ((u32)k[10]<<24);
- case 10: c += ((u32)k[9]<<16);
- case 9 : c += ((u32)k[8]<<8);
- case 8 : b += ((u32)k[7]<<24);
- case 7 : b += ((u32)k[6]<<16);
- case 6 : b += ((u32)k[5]<<8);
+ case 11: c += ((__u32)k[10]<<24);
+ case 10: c += ((__u32)k[9]<<16);
+ case 9 : c += ((__u32)k[8]<<8);
+ case 8 : b += ((__u32)k[7]<<24);
+ case 7 : b += ((__u32)k[6]<<16);
+ case 6 : b += ((__u32)k[5]<<8);
case 5 : b += k[4];
- case 4 : a += ((u32)k[3]<<24);
- case 3 : a += ((u32)k[2]<<16);
- case 2 : a += ((u32)k[1]<<8);
+ case 4 : a += ((__u32)k[3]<<24);
+ case 3 : a += ((__u32)k[2]<<16);
+ case 2 : a += ((__u32)k[1]<<8);
case 1 : a += k[0];
};
@@ -81,12 +81,12 @@
return c;
}
-/* A special optimized version that handles 1 or more of u32s.
- * The length parameter here is the number of u32s in the key.
+/* A special optimized version that handles 1 or more of __u32s.
+ * The length parameter here is the number of __u32s in the key.
*/
-static inline u32 jhash2(u32 *k, u32 length, u32 initval)
+static inline __u32 jhash2(__u32 *k, __u32 length, __u32 initval)
{
- u32 a, b, c, len;
+ __u32 a, b, c, len;
a = b = JHASH_GOLDEN_RATIO;
c = initval;
@@ -119,7 +119,7 @@
* NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
* done at the end is not done here.
*/
-static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+static inline __u32 jhash_3words(__u32 a, __u32 b, __u32 c, __u32 initval)
{
a += JHASH_GOLDEN_RATIO;
b += JHASH_GOLDEN_RATIO;
@@ -130,12 +130,12 @@
return c;
}
-static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
+static inline __u32 jhash_2words(__u32 a, __u32 b, __u32 initval)
{
return jhash_3words(a, b, 0, initval);
}
-static inline u32 jhash_1word(u32 a, u32 initval)
+static inline __u32 jhash_1word(__u32 a, __u32 initval)
{
return jhash_3words(a, 0, 0, initval);
}
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/jiffies.h 2004-01-17 17:04:30.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/jiffies.h 2004-08-26 13:26:33.000000000 -0500
@@ -12,15 +12,15 @@
* without sampling the sequence number in xtime_lock.
* get_jiffies_64() will do this for you as appropriate.
*/
-extern u64 jiffies_64;
+extern __u64 jiffies_64;
extern unsigned long volatile jiffies;
#if (BITS_PER_LONG < 64)
-u64 get_jiffies_64(void);
+__u64 get_jiffies_64(void);
#else
-static inline u64 get_jiffies_64(void)
+static inline __u64 get_jiffies_64(void)
{
- return (u64)jiffies;
+ return (__u64)jiffies;
}
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/kernel_stat.h 2004-04-19 16:13:51.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/kernel_stat.h 2004-08-26 05:42:08.000000000 -0500
@@ -12,13 +12,13 @@
*/
struct cpu_usage_stat {
- u64 user;
- u64 nice;
- u64 system;
- u64 softirq;
- u64 irq;
- u64 idle;
- u64 iowait;
+ __u64 user;
+ __u64 nice;
+ __u64 system;
+ __u64 softirq;
+ __u64 irq;
+ __u64 idle;
+ __u64 iowait;
};
struct kernel_stat {
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/libata.h 2004-08-18 13:16:03.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/libata.h 2004-08-26 05:42:08.000000000 -0500
@@ -160,7 +160,7 @@
struct ata_queued_cmd;
/* typedefs */
-typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, u8 drv_stat);
+typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, __u8 drv_stat);
struct ata_ioports {
unsigned long cmd_addr;
@@ -246,18 +246,18 @@
};
struct ata_device {
- u64 n_sectors; /* size of device, if ATA */
+ __u64 n_sectors; /* size of device, if ATA */
unsigned long flags; /* ATA_DFLAG_xxx */
unsigned int class; /* ATA_DEV_xxx */
unsigned int devno; /* 0 or 1 */
- u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
+ __u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
unsigned int pio_mode;
unsigned int udma_mode;
/* cache info about current transfer mode */
- u8 xfer_protocol; /* taskfile xfer protocol */
- u8 read_cmd; /* opcode to use on read */
- u8 write_cmd; /* opcode to use on write */
+ __u8 xfer_protocol; /* taskfile xfer protocol */
+ __u8 read_cmd; /* opcode to use on read */
+ __u8 write_cmd; /* opcode to use on write */
};
struct ata_port {
@@ -272,8 +272,8 @@
struct ata_ioports ioaddr; /* ATA cmd/ctl/dma register blocks */
- u8 ctl; /* cache of ATA control register */
- u8 last_ctl; /* Cache last written value */
+ __u8 ctl; /* cache of ATA control register */
+ __u8 last_ctl; /* Cache last written value */
unsigned int bus_state;
unsigned int port_state;
unsigned int pio_mask;
@@ -312,7 +312,7 @@
void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);
- u8 (*check_status)(struct ata_port *ap);
+ __u8 (*check_status)(struct ata_port *ap);
void (*phy_reset) (struct ata_port *ap);
void (*post_set_mode) (struct ata_port *ap);
@@ -328,9 +328,9 @@
irqreturn_t (*irq_handler)(int, void *, struct pt_regs *);
void (*irq_clear) (struct ata_port *);
- u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
+ __u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
void (*scr_write) (struct ata_port *ap, unsigned int sc_reg,
- u32 val);
+ __u32 val);
int (*port_start) (struct ata_port *ap);
void (*port_stop) (struct ata_port *ap);
@@ -374,10 +374,10 @@
extern void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf);
extern void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf);
extern void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf);
-extern void ata_tf_to_fis(struct ata_taskfile *tf, u8 *fis, u8 pmp);
-extern void ata_tf_from_fis(u8 *fis, struct ata_taskfile *tf);
-extern u8 ata_check_status_pio(struct ata_port *ap);
-extern u8 ata_check_status_mmio(struct ata_port *ap);
+extern void ata_tf_to_fis(struct ata_taskfile *tf, __u8 *fis, __u8 pmp);
+extern void ata_tf_from_fis(__u8 *fis, struct ata_taskfile *tf);
+extern __u8 ata_check_status_pio(struct ata_port *ap);
+extern __u8 ata_check_status_mmio(struct ata_port *ap);
extern void ata_exec_command_pio(struct ata_port *ap, struct ata_taskfile *tf);
extern void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf);
extern int ata_port_start (struct ata_port *ap);
@@ -397,7 +397,7 @@
extern void ata_bmdma_start_pio (struct ata_queued_cmd *qc);
extern void ata_bmdma_irq_clear(struct ata_port *ap);
extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits);
-extern void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat);
+extern void ata_qc_complete(struct ata_queued_cmd *qc, __u8 drv_stat);
extern void ata_eng_timeout(struct ata_port *ap);
extern int ata_std_bios_param(struct scsi_device *sdev,
struct block_device *bdev,
@@ -416,7 +416,7 @@
(dev->class == ATA_DEV_ATAPI));
}
-static inline u8 ata_chk_err(struct ata_port *ap)
+static inline __u8 ata_chk_err(struct ata_port *ap)
{
if (ap->flags & ATA_FLAG_MMIO) {
return readb((void *) ap->ioaddr.error_addr);
@@ -424,12 +424,12 @@
return inb(ap->ioaddr.error_addr);
}
-static inline u8 ata_chk_status(struct ata_port *ap)
+static inline __u8 ata_chk_status(struct ata_port *ap)
{
return ap->ops->check_status(ap);
}
-static inline u8 ata_altstatus(struct ata_port *ap)
+static inline __u8 ata_altstatus(struct ata_port *ap)
{
if (ap->flags & ATA_FLAG_MMIO)
return readb(ap->ioaddr.altstatus_addr);
@@ -442,10 +442,10 @@
ndelay(400);
}
-static inline u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
+static inline __u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
unsigned int max)
{
- u8 status;
+ __u8 status;
do {
udelay(10);
@@ -456,9 +456,9 @@
return status;
}
-static inline u8 ata_wait_idle(struct ata_port *ap)
+static inline __u8 ata_wait_idle(struct ata_port *ap)
{
- u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
+ __u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
if (status & (ATA_BUSY | ATA_DRQ)) {
unsigned long l = ap->ioaddr.status_addr;
@@ -495,10 +495,10 @@
tf->device = ATA_DEVICE_OBS | ATA_DEV1;
}
-static inline u8 ata_irq_on(struct ata_port *ap)
+static inline __u8 ata_irq_on(struct ata_port *ap)
{
struct ata_ioports *ioaddr = &ap->ioaddr;
- u8 tmp;
+ __u8 tmp;
ap->ctl &= ~ATA_NIEN;
ap->last_ctl = ap->ctl;
@@ -514,10 +514,10 @@
return tmp;
}
-static inline u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
+static inline __u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
{
unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
- u8 host_stat, post_stat, status;
+ __u8 host_stat, post_stat, status;
status = ata_busy_wait(ap, bits, 1000);
if (status & bits)
@@ -545,12 +545,12 @@
return status;
}
-static inline u32 scr_read(struct ata_port *ap, unsigned int reg)
+static inline __u32 scr_read(struct ata_port *ap, unsigned int reg)
{
return ap->ops->scr_read(ap, reg);
}
-static inline void scr_write(struct ata_port *ap, unsigned int reg, u32 val)
+static inline void scr_write(struct ata_port *ap, unsigned int reg, __u32 val)
{
ap->ops->scr_write(ap, reg, val);
}
@@ -589,9 +589,9 @@
}
}
-static inline u8 ata_bmdma_status(struct ata_port *ap)
+static inline __u8 ata_bmdma_status(struct ata_port *ap)
{
- u8 host_stat;
+ __u8 host_stat;
if (ap->flags & ATA_FLAG_MMIO) {
void *mmio = (void *) ap->ioaddr.bmdma_addr;
host_stat = readb(mmio + ATA_DMA_STATUS);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/bind.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/bind.h 2004-08-26 05:42:08.000000000 -0500
@@ -18,7 +18,7 @@
* This is the set of functions for lockd->nfsd communication
*/
struct nlmsvc_binding {
- u32 (*fopen)(struct svc_rqst *,
+ __u32 (*fopen)(struct svc_rqst *,
struct nfs_fh *,
struct file *);
void (*fclose)(struct file *);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/nlm.h 2004-01-17 17:04:34.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/nlm.h 2004-08-26 05:42:08.000000000 -0500
@@ -11,8 +11,8 @@
/* Maximum file offset in file_lock.fl_end */
-# define NLM_OFFSET_MAX ((s32) 0x7fffffff)
-# define NLM4_OFFSET_MAX ((s64) ((~(u64)0) >> 1))
+# define NLM_OFFSET_MAX ((__s32) 0x7fffffff)
+# define NLM4_OFFSET_MAX ((__s64) ((~(__u64)0) >> 1))
/* Return states for NLM */
enum {
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/share.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/share.h 2004-08-26 13:26:43.000000000 -0500
@@ -17,13 +17,13 @@
struct nlm_host * s_host; /* client host */
struct nlm_file * s_file; /* shared file */
struct xdr_netobj s_owner; /* owner handle */
- u32 s_access; /* access mode */
- u32 s_mode; /* deny mode */
+ __u32 s_access; /* access mode */
+ __u32 s_mode; /* deny mode */
};
-u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
+__u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
struct nlm_args *);
-u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
+__u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
struct nlm_args *);
int nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, int);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/sm_inter.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/sm_inter.h 2004-08-26 05:42:08.000000000 -0500
@@ -24,23 +24,23 @@
* Arguments for all calls to statd
*/
struct nsm_args {
- u32 addr; /* remote address */
- u32 prog; /* RPC callback info */
- u32 vers;
- u32 proc;
- u32 proto; /* protocol (udp/tcp) plus server/client flag */
+ __u32 addr; /* remote address */
+ __u32 prog; /* RPC callback info */
+ __u32 vers;
+ __u32 proc;
+ __u32 proto; /* protocol (udp/tcp) plus server/client flag */
};
/*
* Result returned by statd
*/
struct nsm_res {
- u32 status;
- u32 state;
+ __u32 status;
+ __u32 state;
};
int nsm_monitor(struct nlm_host *);
int nsm_unmonitor(struct nlm_host *);
-extern u32 nsm_local_state;
+extern __u32 nsm_local_state;
#endif /* LINUX_LOCKD_SM_INTER_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr.h 2004-01-05 12:42:33.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/xdr.h 2004-08-26 05:42:08.000000000 -0500
@@ -48,12 +48,12 @@
struct nlm_args {
struct nlm_cookie cookie;
struct nlm_lock lock;
- u32 block;
- u32 reclaim;
- u32 state;
- u32 monitor;
- u32 fsm_access;
- u32 fsm_mode;
+ __u32 block;
+ __u32 reclaim;
+ __u32 state;
+ __u32 monitor;
+ __u32 fsm_access;
+ __u32 fsm_mode;
};
typedef struct nlm_args nlm_args;
@@ -63,7 +63,7 @@
*/
struct nlm_res {
struct nlm_cookie cookie;
- u32 status;
+ __u32 status;
struct nlm_lock lock;
};
@@ -73,10 +73,10 @@
struct nlm_reboot {
char * mon;
int len;
- u32 state;
- u32 addr;
- u32 vers;
- u32 proto;
+ __u32 state;
+ __u32 addr;
+ __u32 vers;
+ __u32 proto;
};
/*
@@ -84,24 +84,24 @@
*/
#define NLMSVC_XDRSIZE sizeof(struct nlm_args)
-int nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlmsvc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlmsvc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlmsvc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlmsvc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlmsvc_encode_void(struct svc_rqst *, u32 *, void *);
-int nlmsvc_decode_void(struct svc_rqst *, u32 *, void *);
-int nlmsvc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlmsvc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlmsvc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlmsvc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
+int nlmsvc_decode_testargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlmsvc_encode_testres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlmsvc_decode_lockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlmsvc_decode_cancargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlmsvc_decode_unlockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlmsvc_encode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlmsvc_decode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlmsvc_encode_void(struct svc_rqst *, __u32 *, void *);
+int nlmsvc_decode_void(struct svc_rqst *, __u32 *, void *);
+int nlmsvc_decode_shareargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlmsvc_encode_shareres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlmsvc_decode_notify(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlmsvc_decode_reboot(struct svc_rqst *, __u32 *, struct nlm_reboot *);
/*
-int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
+int nlmclt_encode_testargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int nlmclt_encode_lockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int nlmclt_encode_cancargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int nlmclt_encode_unlockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
*/
#endif /* LOCKD_XDR_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr4.h 2004-01-05 12:42:33.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/xdr4.h 2004-08-26 05:42:08.000000000 -0500
@@ -22,24 +22,24 @@
-int nlm4svc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlm4svc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlm4svc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlm4svc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlm4svc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlm4svc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlm4svc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlm4svc_encode_void(struct svc_rqst *, u32 *, void *);
-int nlm4svc_decode_void(struct svc_rqst *, u32 *, void *);
-int nlm4svc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlm4svc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
-int nlm4svc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
-int nlm4svc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
+int nlm4svc_decode_testargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlm4svc_encode_testres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlm4svc_decode_lockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlm4svc_decode_cancargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlm4svc_decode_unlockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlm4svc_encode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlm4svc_decode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlm4svc_encode_void(struct svc_rqst *, __u32 *, void *);
+int nlm4svc_decode_void(struct svc_rqst *, __u32 *, void *);
+int nlm4svc_decode_shareargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlm4svc_encode_shareres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int nlm4svc_decode_notify(struct svc_rqst *, __u32 *, struct nlm_args *);
+int nlm4svc_decode_reboot(struct svc_rqst *, __u32 *, struct nlm_reboot *);
/*
-int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
+int nlmclt_encode_testargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int nlmclt_encode_lockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int nlmclt_encode_cancargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int nlmclt_encode_unlockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
*/
#endif /* LOCKD_XDR4_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/mca.h 2004-08-18 13:16:03.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mca.h 2004-08-26 05:42:08.000000000 -0500
@@ -50,7 +50,7 @@
};
struct mca_device {
- u64 dma_mask;
+ __u64 dma_mask;
int pos_id;
int slot;
@@ -91,7 +91,7 @@
};
struct mca_bus {
- u64 default_dma_mask;
+ __u64 default_dma_mask;
int number;
struct mca_bus_accessor_functions f;
struct device dev;
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/mii.h 2004-06-23 16:52:55.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mii.h 2004-08-26 05:42:08.000000000 -0500
@@ -138,10 +138,10 @@
/* This structure is used in all SIOCxMIIxxx ioctl calls */
struct mii_ioctl_data {
- u16 phy_id;
- u16 reg_num;
- u16 val_in;
- u16 val_out;
+ __u16 phy_id;
+ __u16 reg_num;
+ __u16 val_in;
+ __u16 val_out;
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/map.h 2004-08-18 13:16:06.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mtd/map.h 2004-08-26 05:42:08.000000000 -0500
@@ -36,20 +36,20 @@
int buswidth; /* in octets */
#ifdef CONFIG_MTD_COMPLEX_MAPPINGS
- u8 (*read8)(struct map_info *, unsigned long);
- u16 (*read16)(struct map_info *, unsigned long);
- u32 (*read32)(struct map_info *, unsigned long);
- u64 (*read64)(struct map_info *, unsigned long);
+ __u8 (*read8)(struct map_info *, unsigned long);
+ __u16 (*read16)(struct map_info *, unsigned long);
+ __u32 (*read32)(struct map_info *, unsigned long);
+ __u64 (*read64)(struct map_info *, unsigned long);
/* If it returned a 'long' I'd call it readl.
* It doesn't.
* I won't.
* dwmw2 */
void (*copy_from)(struct map_info *, void *, unsigned long, ssize_t);
- void (*write8)(struct map_info *, u8, unsigned long);
- void (*write16)(struct map_info *, u16, unsigned long);
- void (*write32)(struct map_info *, u32, unsigned long);
- void (*write64)(struct map_info *, u64, unsigned long);
+ void (*write8)(struct map_info *, __u8, unsigned long);
+ void (*write16)(struct map_info *, __u16, unsigned long);
+ void (*write32)(struct map_info *, __u32, unsigned long);
+ void (*write64)(struct map_info *, __u64, unsigned long);
void (*copy_to)(struct map_info *, unsigned long, const void *, ssize_t);
/* We can perhaps put in 'point' and 'unpoint' methods, if we really
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/nand.h 2004-08-18 13:16:06.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mtd/nand.h 2004-08-26 05:42:08.000000000 -0500
@@ -271,8 +271,8 @@
u_char (*read_byte)(struct mtd_info *mtd);
void (*write_byte)(struct mtd_info *mtd, u_char byte);
- u16 (*read_word)(struct mtd_info *mtd);
- void (*write_word)(struct mtd_info *mtd, u16 word);
+ __u16 (*read_word)(struct mtd_info *mtd);
+ void (*write_word)(struct mtd_info *mtd, __u16 word);
void (*write_buf)(struct mtd_info *mtd, const u_char *buf, int len);
void (*read_buf)(struct mtd_info *mtd, u_char *buf, int len);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/pmc551.h 2004-03-28 07:52:13.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/mtd/pmc551.h 2004-08-26 05:42:08.000000000 -0500
@@ -25,9 +25,9 @@
struct mypriv {
struct pci_dev *dev;
u_char *start;
- u32 base_map0;
- u32 curr_map0;
- u32 asize;
+ __u32 base_map0;
+ __u32 curr_map0;
+ __u32 asize;
struct mtd_info *nextpmc551;
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nbd.h 2004-03-28 07:52:09.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/nbd.h 2004-08-26 05:42:08.000000000 -0500
@@ -45,11 +45,11 @@
* server. All data are in network byte order.
*/
struct nbd_request {
- u32 magic;
- u32 type; /* == READ || == WRITE */
+ __u32 magic;
+ __u32 type; /* == READ || == WRITE */
char handle[8];
- u64 from;
- u32 len;
+ __u64 from;
+ __u32 len;
}
#ifdef __GNUC__
__attribute__ ((packed))
@@ -61,8 +61,8 @@
* it has completed an I/O request (or an error occurs).
*/
struct nbd_reply {
- u32 magic;
- u32 error; /* 0 = ok, else error */
+ __u32 magic;
+ __u32 error; /* 0 = ok, else error */
char handle[8]; /* handle you got from request */
};
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_i.h 2004-01-17 17:04:31.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/nfs_fs_i.h 2004-08-26 05:42:08.000000000 -0500
@@ -8,8 +8,8 @@
* NFS lock info
*/
struct nfs_lock_info {
- u32 state;
- u32 flags;
+ __u32 state;
+ __u32 flags;
struct nlm_host *host;
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_sb.h 2004-06-09 07:00:50.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfs_fs_sb.h 2004-08-26 05:42:08.000000000 -0500
@@ -37,10 +37,10 @@
struct list_head nfs4_siblings; /* List of other nfs_server structs
* that share the same clientid
*/
- u32 attr_bitmask[2];/* V4 bitmask representing the set
+ __u32 attr_bitmask[2];/* V4 bitmask representing the set
of attributes supported on this
filesystem */
- u32 acl_bitmask; /* V4 bitmask representing the ACEs
+ __u32 acl_bitmask; /* V4 bitmask representing the ACEs
that are supported on this
filesystem */
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_xdr.h 2004-06-09 07:00:50.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfs_xdr.h 2004-08-26 05:42:08.000000000 -0500
@@ -90,9 +90,9 @@
};
struct nfs4_change_info {
- u32 atomic;
- u64 before;
- u64 after;
+ __u32 atomic;
+ __u64 before;
+ __u64 after;
};
/*
@@ -112,7 +112,7 @@
} u;
const struct qstr * name;
const struct nfs_server *server; /* Needed for ID mapping */
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs_openres {
@@ -168,7 +168,7 @@
* */
struct nfs_lowner {
__u64 clientid;
- u32 id;
+ __u32 id;
};
struct nfs_open_to_lock {
@@ -328,7 +328,7 @@
nfs4_stateid stateid;
struct iattr * iap;
const struct nfs_server * server; /* Needed for name mapping */
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs_setattrres {
@@ -482,32 +482,32 @@
#ifdef CONFIG_NFS_V4
-typedef u64 clientid4;
+typedef __u64 clientid4;
struct nfs4_accessargs {
const struct nfs_fh * fh;
- u32 access;
+ __u32 access;
};
struct nfs4_accessres {
- u32 supported;
- u32 access;
+ __u32 supported;
+ __u32 access;
};
struct nfs4_create_arg {
- u32 ftype;
+ __u32 ftype;
union {
struct qstr * symlink; /* NF4LNK */
struct {
- u32 specdata1;
- u32 specdata2;
+ __u32 specdata1;
+ __u32 specdata2;
} device; /* NF4BLK, NF4CHR */
} u;
const struct qstr * name;
const struct nfs_server * server;
const struct iattr * attrs;
const struct nfs_fh * dir_fh;
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_create_res {
@@ -519,12 +519,12 @@
struct nfs4_fsinfo_arg {
const struct nfs_fh * fh;
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_getattr_arg {
const struct nfs_fh * fh;
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_getattr_res {
@@ -541,7 +541,7 @@
struct nfs4_lookup_arg {
const struct nfs_fh * dir_fh;
const struct qstr * name;
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_lookup_res {
@@ -551,19 +551,19 @@
};
struct nfs4_lookup_root_arg {
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_pathconf_arg {
const struct nfs_fh * fh;
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_readdir_arg {
const struct nfs_fh * fh;
- u64 cookie;
+ __u64 cookie;
nfs4_verifier verifier;
- u32 count;
+ __u32 count;
struct page ** pages; /* zero-copy data */
unsigned int pgbase; /* zero-copy data */
};
@@ -575,7 +575,7 @@
struct nfs4_readlink {
const struct nfs_fh * fh;
- u32 count; /* zero-copy data */
+ __u32 count; /* zero-copy data */
struct page ** pages; /* zero-copy data */
};
@@ -599,23 +599,23 @@
struct nfs4_setclientid {
nfs4_verifier sc_verifier; /* request */
char * sc_name; /* request */
- u32 sc_prog; /* request */
+ __u32 sc_prog; /* request */
char sc_netid[4]; /* request */
char sc_uaddr[24]; /* request */
- u32 sc_cb_ident; /* request */
+ __u32 sc_cb_ident; /* request */
struct nfs4_client * sc_state; /* response */
};
struct nfs4_statfs_arg {
const struct nfs_fh * fh;
- const u32 * bitmask;
+ const __u32 * bitmask;
};
struct nfs4_server_caps_res {
- u32 attr_bitmask[2];
- u32 acl_bitmask;
- u32 has_links;
- u32 has_symlinks;
+ __u32 attr_bitmask[2];
+ __u32 acl_bitmask;
+ __u32 has_links;
+ __u32 has_symlinks;
};
#endif /* CONFIG_NFS_V4 */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/state.h 2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/state.h 2004-08-26 05:42:08.000000000 -0500
@@ -41,18 +41,18 @@
#define NFS4_OPAQUE_LIMIT 1024
typedef struct {
- u32 cl_boot;
- u32 cl_id;
+ __u32 cl_boot;
+ __u32 cl_id;
} clientid_t;
typedef struct {
- u32 so_boot;
- u32 so_stateownerid;
- u32 so_fileid;
+ __u32 so_boot;
+ __u32 so_stateownerid;
+ __u32 so_fileid;
} stateid_opaque_t;
typedef struct {
- u32 si_generation;
+ __u32 si_generation;
stateid_opaque_t si_opaque;
} stateid_t;
#define si_boot si_opaque.so_boot
@@ -68,14 +68,14 @@
/* client delegation callback info */
struct nfs4_callback {
/* SETCLIENTID info */
- u32 cb_parsed; /* addr parsed */
- u32 cb_addr;
+ __u32 cb_parsed; /* addr parsed */
+ __u32 cb_addr;
unsigned short cb_port;
- u32 cb_prog;
- u32 cb_ident;
+ __u32 cb_prog;
+ __u32 cb_ident;
struct xdr_netobj cb_netid;
/* RPC client info */
- u32 cb_set; /* successful CB_NULL call */
+ __u32 cb_set; /* successful CB_NULL call */
struct rpc_program cb_program;
struct rpc_stat cb_stat;
struct rpc_clnt * cb_client;
@@ -99,7 +99,7 @@
struct xdr_netobj cl_name; /* id generated by client */
nfs4_verifier cl_verifier; /* generated by client */
time_t cl_time; /* time of last lease renewal */
- u32 cl_addr; /* client ipaddress */
+ __u32 cl_addr; /* client ipaddress */
struct svc_cred cl_cred; /* setclientid principal */
clientid_t cl_clientid; /* generated by server */
nfs4_verifier cl_confirm; /* generated by server */
@@ -116,7 +116,7 @@
struct list_head cr_strhash; /* hash by cr_name */
struct xdr_netobj cr_name; /* id generated by client */
time_t cr_first_state; /* first state aquisition */
- u32 cr_expired; /* boolean: lease expired? */
+ __u32 cr_expired; /* boolean: lease expired? */
};
static inline void
@@ -139,7 +139,7 @@
* is cached.
*/
struct nfs4_replay {
- u32 rp_status;
+ __u32 rp_status;
unsigned int rp_buflen;
char *rp_buf;
unsigned intrp_allocated;
@@ -175,9 +175,9 @@
struct list_head so_close_lru; /* tail queue */
time_t so_time; /* time of placement on so_close_lru */
int so_is_open_owner; /* 1=openowner,0=lockowner */
- u32 so_id;
+ __u32 so_id;
struct nfs4_client * so_client;
- u32 so_seqid;
+ __u32 so_seqid;
struct xdr_netobj so_owner; /* open owner name */
int so_confirmed; /* successful OPEN_CONFIRM? */
struct nfs4_replay so_replay;
@@ -192,7 +192,7 @@
struct list_head fi_hash; /* hash by "struct inode *" */
struct list_head fi_perfile; /* list: nfs4_stateid */
struct inode *fi_inode;
- u32 fi_id; /* used with stateowner->so_id
+ __u32 fi_id; /* used with stateowner->so_id
* for stateid_hashtbl hash */
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr.h 2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr.h 2004-08-26 05:42:08.000000000 -0500
@@ -83,7 +83,7 @@
struct svc_fh fh;
__u32 cookie;
__u32 count;
- u32 * buffer;
+ __u32 * buffer;
};
struct nfsd_attrstat {
@@ -107,9 +107,9 @@
int count;
struct readdir_cd common;
- u32 * buffer;
+ __u32 * buffer;
int buflen;
- u32 * offset;
+ __u32 * offset;
};
struct nfsd_statfsres {
@@ -134,39 +134,39 @@
#define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore)
-int nfssvc_decode_void(struct svc_rqst *, u32 *, void *);
-int nfssvc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
-int nfssvc_decode_sattrargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_void(struct svc_rqst *, __u32 *, void *);
+int nfssvc_decode_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
+int nfssvc_decode_sattrargs(struct svc_rqst *, __u32 *,
struct nfsd_sattrargs *);
-int nfssvc_decode_diropargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_diropargs(struct svc_rqst *, __u32 *,
struct nfsd_diropargs *);
-int nfssvc_decode_readargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_readargs(struct svc_rqst *, __u32 *,
struct nfsd_readargs *);
-int nfssvc_decode_writeargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_writeargs(struct svc_rqst *, __u32 *,
struct nfsd_writeargs *);
-int nfssvc_decode_createargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_createargs(struct svc_rqst *, __u32 *,
struct nfsd_createargs *);
-int nfssvc_decode_renameargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_renameargs(struct svc_rqst *, __u32 *,
struct nfsd_renameargs *);
-int nfssvc_decode_readlinkargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_readlinkargs(struct svc_rqst *, __u32 *,
struct nfsd_readlinkargs *);
-int nfssvc_decode_linkargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_linkargs(struct svc_rqst *, __u32 *,
struct nfsd_linkargs *);
-int nfssvc_decode_symlinkargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_symlinkargs(struct svc_rqst *, __u32 *,
struct nfsd_symlinkargs *);
-int nfssvc_decode_readdirargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_readdirargs(struct svc_rqst *, __u32 *,
struct nfsd_readdirargs *);
-int nfssvc_encode_void(struct svc_rqst *, u32 *, void *);
-int nfssvc_encode_attrstat(struct svc_rqst *, u32 *, struct nfsd_attrstat *);
-int nfssvc_encode_diropres(struct svc_rqst *, u32 *, struct nfsd_diropres *);
-int nfssvc_encode_readlinkres(struct svc_rqst *, u32 *, struct nfsd_readlinkres *);
-int nfssvc_encode_readres(struct svc_rqst *, u32 *, struct nfsd_readres *);
-int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *);
-int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *);
+int nfssvc_encode_void(struct svc_rqst *, __u32 *, void *);
+int nfssvc_encode_attrstat(struct svc_rqst *, __u32 *, struct nfsd_attrstat *);
+int nfssvc_encode_diropres(struct svc_rqst *, __u32 *, struct nfsd_diropres *);
+int nfssvc_encode_readlinkres(struct svc_rqst *, __u32 *, struct nfsd_readlinkres *);
+int nfssvc_encode_readres(struct svc_rqst *, __u32 *, struct nfsd_readres *);
+int nfssvc_encode_statfsres(struct svc_rqst *, __u32 *, struct nfsd_statfsres *);
+int nfssvc_encode_readdirres(struct svc_rqst *, __u32 *, struct nfsd_readdirres *);
int nfssvc_encode_entry(struct readdir_cd *, const char *name,
int namlen, loff_t offset, ino_t ino, unsigned int);
-int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
+int nfssvc_release_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
#endif /* LINUX_NFSD_H */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr3.h 2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr3.h 2004-08-26 05:42:08.000000000 -0500
@@ -101,7 +101,7 @@
__u32 dircount;
__u32 count;
__u32 * verf;
- u32 * buffer;
+ __u32 * buffer;
};
struct nfsd3_commitargs {
@@ -167,10 +167,10 @@
__u32 verf[2];
struct readdir_cd common;
- u32 * buffer;
+ __u32 * buffer;
int buflen;
- u32 * offset;
- u32 * offset1;
+ __u32 * offset;
+ __u32 * offset1;
struct svc_rqst * rqstp;
};
@@ -245,70 +245,70 @@
#define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore)
-int nfs3svc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
-int nfs3svc_decode_sattrargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
+int nfs3svc_decode_sattrargs(struct svc_rqst *, __u32 *,
struct nfsd3_sattrargs *);
-int nfs3svc_decode_diropargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_diropargs(struct svc_rqst *, __u32 *,
struct nfsd3_diropargs *);
-int nfs3svc_decode_accessargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_accessargs(struct svc_rqst *, __u32 *,
struct nfsd3_accessargs *);
-int nfs3svc_decode_readargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readargs(struct svc_rqst *, __u32 *,
struct nfsd3_readargs *);
-int nfs3svc_decode_writeargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_writeargs(struct svc_rqst *, __u32 *,
struct nfsd3_writeargs *);
-int nfs3svc_decode_createargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_createargs(struct svc_rqst *, __u32 *,
struct nfsd3_createargs *);
-int nfs3svc_decode_mkdirargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_mkdirargs(struct svc_rqst *, __u32 *,
struct nfsd3_createargs *);
-int nfs3svc_decode_mknodargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_mknodargs(struct svc_rqst *, __u32 *,
struct nfsd3_mknodargs *);
-int nfs3svc_decode_renameargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_renameargs(struct svc_rqst *, __u32 *,
struct nfsd3_renameargs *);
-int nfs3svc_decode_readlinkargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readlinkargs(struct svc_rqst *, __u32 *,
struct nfsd3_readlinkargs *);
-int nfs3svc_decode_linkargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_linkargs(struct svc_rqst *, __u32 *,
struct nfsd3_linkargs *);
-int nfs3svc_decode_symlinkargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_symlinkargs(struct svc_rqst *, __u32 *,
struct nfsd3_symlinkargs *);
-int nfs3svc_decode_readdirargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readdirargs(struct svc_rqst *, __u32 *,
struct nfsd3_readdirargs *);
-int nfs3svc_decode_readdirplusargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __u32 *,
struct nfsd3_readdirargs *);
-int nfs3svc_decode_commitargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_commitargs(struct svc_rqst *, __u32 *,
struct nfsd3_commitargs *);
-int nfs3svc_encode_voidres(struct svc_rqst *, u32 *, void *);
-int nfs3svc_encode_attrstat(struct svc_rqst *, u32 *,
+int nfs3svc_encode_voidres(struct svc_rqst *, __u32 *, void *);
+int nfs3svc_encode_attrstat(struct svc_rqst *, __u32 *,
struct nfsd3_attrstat *);
-int nfs3svc_encode_wccstat(struct svc_rqst *, u32 *,
+int nfs3svc_encode_wccstat(struct svc_rqst *, __u32 *,
struct nfsd3_attrstat *);
-int nfs3svc_encode_diropres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_diropres(struct svc_rqst *, __u32 *,
struct nfsd3_diropres *);
-int nfs3svc_encode_accessres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_accessres(struct svc_rqst *, __u32 *,
struct nfsd3_accessres *);
-int nfs3svc_encode_readlinkres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_readlinkres(struct svc_rqst *, __u32 *,
struct nfsd3_readlinkres *);
-int nfs3svc_encode_readres(struct svc_rqst *, u32 *, struct nfsd3_readres *);
-int nfs3svc_encode_writeres(struct svc_rqst *, u32 *, struct nfsd3_writeres *);
-int nfs3svc_encode_createres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_readres(struct svc_rqst *, __u32 *, struct nfsd3_readres *);
+int nfs3svc_encode_writeres(struct svc_rqst *, __u32 *, struct nfsd3_writeres *);
+int nfs3svc_encode_createres(struct svc_rqst *, __u32 *,
struct nfsd3_diropres *);
-int nfs3svc_encode_renameres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_renameres(struct svc_rqst *, __u32 *,
struct nfsd3_renameres *);
-int nfs3svc_encode_linkres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_linkres(struct svc_rqst *, __u32 *,
struct nfsd3_linkres *);
-int nfs3svc_encode_readdirres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_readdirres(struct svc_rqst *, __u32 *,
struct nfsd3_readdirres *);
-int nfs3svc_encode_fsstatres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_fsstatres(struct svc_rqst *, __u32 *,
struct nfsd3_fsstatres *);
-int nfs3svc_encode_fsinfores(struct svc_rqst *, u32 *,
+int nfs3svc_encode_fsinfores(struct svc_rqst *, __u32 *,
struct nfsd3_fsinfores *);
-int nfs3svc_encode_pathconfres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_pathconfres(struct svc_rqst *, __u32 *,
struct nfsd3_pathconfres *);
-int nfs3svc_encode_commitres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_commitres(struct svc_rqst *, __u32 *,
struct nfsd3_commitres *);
-int nfs3svc_release_fhandle(struct svc_rqst *, u32 *,
+int nfs3svc_release_fhandle(struct svc_rqst *, __u32 *,
struct nfsd3_attrstat *);
-int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *,
+int nfs3svc_release_fhandle2(struct svc_rqst *, __u32 *,
struct nfsd3_fhandle_pair *);
int nfs3svc_encode_entry(struct readdir_cd *, const char *name,
int namlen, loff_t offset, ino_t ino,
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr4.h 2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr4.h 2004-08-26 05:42:08.000000000 -0500
@@ -42,9 +42,9 @@
#define NFSD4_MAX_TAGLEN 128
#define XDR_LEN(n) (((n) + 3) & ~3)
-typedef u32 delegation_zero_t;
-typedef u32 delegation_boot_t;
-typedef u64 delegation_id_t;
+typedef __u32 delegation_zero_t;
+typedef __u32 delegation_boot_t;
+typedef __u64 delegation_id_t;
typedef struct {
delegation_zero_t ds_zero;
@@ -53,46 +53,46 @@
} delegation_stateid_t;
struct nfsd4_change_info {
- u32 atomic;
- u32 before_ctime_sec;
- u32 before_ctime_nsec;
- u32 after_ctime_sec;
- u32 after_ctime_nsec;
+ __u32 atomic;
+ __u32 before_ctime_sec;
+ __u32 before_ctime_nsec;
+ __u32 after_ctime_sec;
+ __u32 after_ctime_nsec;
};
struct nfsd4_access {
- u32 ac_req_access; /* request */
- u32 ac_supported; /* response */
- u32 ac_resp_access; /* response */
+ __u32 ac_req_access; /* request */
+ __u32 ac_supported; /* response */
+ __u32 ac_resp_access; /* response */
};
struct nfsd4_close {
- u32 cl_seqid; /* request */
+ __u32 cl_seqid; /* request */
stateid_t cl_stateid; /* request+response */
struct nfs4_stateowner * cl_stateowner; /* response */
};
struct nfsd4_commit {
- u64 co_offset; /* request */
- u32 co_count; /* request */
+ __u64 co_offset; /* request */
+ __u32 co_count; /* request */
nfs4_verifier co_verf; /* response */
};
struct nfsd4_create {
- u32 cr_namelen; /* request */
+ __u32 cr_namelen; /* request */
char * cr_name; /* request */
- u32 cr_type; /* request */
+ __u32 cr_type; /* request */
union { /* request */
struct {
- u32 namelen;
+ __u32 namelen;
char *name;
} link; /* NF4LNK */
struct {
- u32 specdata1;
- u32 specdata2;
+ __u32 specdata1;
+ __u32 specdata2;
} dev; /* NF4BLK, NF4CHR */
} u;
- u32 cr_bmval[2]; /* request */
+ __u32 cr_bmval[2]; /* request */
struct iattr cr_iattr; /* request */
struct nfsd4_change_info cr_cinfo; /* response */
};
@@ -102,41 +102,41 @@
#define cr_specdata2 u.dev.specdata2
struct nfsd4_getattr {
- u32 ga_bmval[2]; /* request */
+ __u32 ga_bmval[2]; /* request */
struct svc_fh *ga_fhp; /* response */
};
struct nfsd4_link {
- u32 li_namelen; /* request */
+ __u32 li_namelen; /* request */
char * li_name; /* request */
struct nfsd4_change_info li_cinfo; /* response */
};
struct nfsd4_lock_denied {
struct nfs4_stateowner *ld_sop;
- u64 ld_start;
- u64 ld_length;
- u32 ld_type;
+ __u64 ld_start;
+ __u64 ld_length;
+ __u32 ld_type;
};
struct nfsd4_lock {
/* request */
- u32 lk_type;
- u32 lk_reclaim; /* boolean */
- u64 lk_offset;
- u64 lk_length;
- u32 lk_is_new;
+ __u32 lk_type;
+ __u32 lk_reclaim; /* boolean */
+ __u64 lk_offset;
+ __u64 lk_length;
+ __u32 lk_is_new;
union {
struct {
- u32 open_seqid;
+ __u32 open_seqid;
stateid_t open_stateid;
- u32 lock_seqid;
+ __u32 lock_seqid;
clientid_t clientid;
struct xdr_netobj owner;
} new;
struct {
stateid_t lock_stateid;
- u32 lock_seqid;
+ __u32 lock_seqid;
} old;
} v;
@@ -164,56 +164,56 @@
struct nfsd4_lockt {
- u32 lt_type;
+ __u32 lt_type;
clientid_t lt_clientid;
struct xdr_netobj lt_owner;
- u64 lt_offset;
- u64 lt_length;
+ __u64 lt_offset;
+ __u64 lt_length;
struct nfs4_stateowner * lt_stateowner;
struct nfsd4_lock_denied lt_denied;
};
struct nfsd4_locku {
- u32 lu_type;
- u32 lu_seqid;
+ __u32 lu_type;
+ __u32 lu_seqid;
stateid_t lu_stateid;
- u64 lu_offset;
- u64 lu_length;
+ __u64 lu_offset;
+ __u64 lu_length;
struct nfs4_stateowner *lu_stateowner;
};
struct nfsd4_lookup {
- u32 lo_len; /* request */
+ __u32 lo_len; /* request */
char * lo_name; /* request */
};
struct nfsd4_putfh {
- u32 pf_fhlen; /* request */
+ __u32 pf_fhlen; /* request */
char *pf_fhval; /* request */
};
struct nfsd4_open {
- u32 op_claim_type; /* request */
+ __u32 op_claim_type; /* request */
struct xdr_netobj op_fname; /* request - everything but CLAIM_PREV */
- u32 op_delegate_type; /* request - CLAIM_PREV only */
+ __u32 op_delegate_type; /* request - CLAIM_PREV only */
delegation_stateid_t op_delegate_stateid; /* request - CLAIM_DELEGATE_CUR only */
- u32 op_create; /* request */
- u32 op_createmode; /* request */
- u32 op_bmval[2]; /* request */
+ __u32 op_create; /* request */
+ __u32 op_createmode; /* request */
+ __u32 op_bmval[2]; /* request */
union { /* request */
struct iattr iattr; /* UNCHECKED4,GUARDED4 */
nfs4_verifier verf; /* EXCLUSIVE4 */
} u;
clientid_t op_clientid; /* request */
struct xdr_netobj op_owner; /* request */
- u32 op_seqid; /* request */
- u32 op_share_access; /* request */
- u32 op_share_deny; /* request */
+ __u32 op_seqid; /* request */
+ __u32 op_share_access; /* request */
+ __u32 op_share_deny; /* request */
stateid_t op_stateid; /* response */
struct nfsd4_change_info op_cinfo; /* response */
- u32 op_rflags; /* response */
+ __u32 op_rflags; /* response */
int op_truncate; /* used during processing */
struct nfs4_stateowner *op_stateowner; /* used during processing */
@@ -223,24 +223,24 @@
struct nfsd4_open_confirm {
stateid_t oc_req_stateid /* request */;
- u32 oc_seqid /* request */;
+ __u32 oc_seqid /* request */;
stateid_t oc_resp_stateid /* response */;
struct nfs4_stateowner * oc_stateowner; /* response */
};
struct nfsd4_open_downgrade {
stateid_t od_stateid;
- u32 od_seqid;
- u32 od_share_access;
- u32 od_share_deny;
+ __u32 od_seqid;
+ __u32 od_share_access;
+ __u32 od_share_deny;
struct nfs4_stateowner *od_stateowner;
};
struct nfsd4_read {
stateid_t rd_stateid; /* request */
- u64 rd_offset; /* request */
- u32 rd_length; /* request */
+ __u64 rd_offset; /* request */
+ __u32 rd_length; /* request */
struct kvec rd_iov[RPCSVC_MAXPAGES];
int rd_vlen;
@@ -249,18 +249,18 @@
};
struct nfsd4_readdir {
- u64 rd_cookie; /* request */
+ __u64 rd_cookie; /* request */
nfs4_verifier rd_verf; /* request */
- u32 rd_dircount; /* request */
- u32 rd_maxcount; /* request */
- u32 rd_bmval[2]; /* request */
+ __u32 rd_dircount; /* request */
+ __u32 rd_maxcount; /* request */
+ __u32 rd_bmval[2]; /* request */
struct svc_rqst *rd_rqstp; /* response */
struct svc_fh * rd_fhp; /* response */
struct readdir_cd common;
- u32 * buffer;
+ __u32 * buffer;
int buflen;
- u32 * offset;
+ __u32 * offset;
};
struct nfsd4_release_lockowner {
@@ -273,15 +273,15 @@
};
struct nfsd4_remove {
- u32 rm_namelen; /* request */
+ __u32 rm_namelen; /* request */
char * rm_name; /* request */
struct nfsd4_change_info rm_cinfo; /* response */
};
struct nfsd4_rename {
- u32 rn_snamelen; /* request */
+ __u32 rn_snamelen; /* request */
char * rn_sname; /* request */
- u32 rn_tnamelen; /* request */
+ __u32 rn_tnamelen; /* request */
char * rn_tname; /* request */
struct nfsd4_change_info rn_sinfo; /* response */
struct nfsd4_change_info rn_tinfo; /* response */
@@ -289,20 +289,20 @@
struct nfsd4_setattr {
stateid_t sa_stateid; /* request */
- u32 sa_bmval[2]; /* request */
+ __u32 sa_bmval[2]; /* request */
struct iattr sa_iattr; /* request */
};
struct nfsd4_setclientid {
nfs4_verifier se_verf; /* request */
- u32 se_namelen; /* request */
+ __u32 se_namelen; /* request */
char * se_name; /* request */
- u32 se_callback_prog; /* request */
- u32 se_callback_netid_len; /* request */
+ __u32 se_callback_prog; /* request */
+ __u32 se_callback_netid_len; /* request */
char * se_callback_netid_val; /* request */
- u32 se_callback_addr_len; /* request */
+ __u32 se_callback_addr_len; /* request */
char * se_callback_addr_val; /* request */
- u32 se_callback_ident; /* request */
+ __u32 se_callback_ident; /* request */
clientid_t se_clientid; /* response */
nfs4_verifier se_confirm; /* response */
};
@@ -314,21 +314,21 @@
/* also used for NVERIFY */
struct nfsd4_verify {
- u32 ve_bmval[2]; /* request */
- u32 ve_attrlen; /* request */
+ __u32 ve_bmval[2]; /* request */
+ __u32 ve_attrlen; /* request */
char * ve_attrval; /* request */
};
struct nfsd4_write {
stateid_t wr_stateid; /* request */
- u64 wr_offset; /* request */
- u32 wr_stable_how; /* request */
- u32 wr_buflen; /* request */
+ __u64 wr_offset; /* request */
+ __u32 wr_stable_how; /* request */
+ __u32 wr_buflen; /* request */
struct kvec wr_vec[RPCSVC_MAXPAGES]; /* request */
int wr_vlen;
- u32 wr_bytes_written; /* response */
- u32 wr_how_written; /* response */
+ __u32 wr_bytes_written; /* response */
+ __u32 wr_how_written; /* response */
nfs4_verifier wr_verifier; /* response */
};
@@ -370,12 +370,12 @@
struct nfsd4_compoundargs {
/* scratch variables for XDR decode */
- u32 * p;
- u32 * end;
+ __u32 * p;
+ __u32 * end;
struct page ** pagelist;
int pagelen;
- u32 tmp[8];
- u32 * tmpp;
+ __u32 tmp[8];
+ __u32 * tmpp;
struct tmpbuf {
struct tmpbuf *next;
void (*release)(const void *);
@@ -384,25 +384,25 @@
struct svc_rqst *rqstp;
- u32 taglen;
+ __u32 taglen;
char * tag;
- u32 minorversion;
- u32 opcnt;
+ __u32 minorversion;
+ __u32 opcnt;
struct nfsd4_op *ops;
struct nfsd4_op iops[8];
};
struct nfsd4_compoundres {
/* scratch variables for XDR encode */
- u32 * p;
- u32 * end;
+ __u32 * p;
+ __u32 * end;
struct xdr_buf * xbuf;
struct svc_rqst * rqstp;
- u32 taglen;
+ __u32 taglen;
char * tag;
- u32 opcnt;
- u32 * tagp; /* where to encode tag and opcount */
+ __u32 opcnt;
+ __u32 * tagp; /* where to encode tag and opcount */
};
#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs)
@@ -418,16 +418,16 @@
cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec;
}
-int nfs4svc_encode_voidres(struct svc_rqst *, u32 *, void *);
-int nfs4svc_decode_compoundargs(struct svc_rqst *, u32 *,
+int nfs4svc_encode_voidres(struct svc_rqst *, __u32 *, void *);
+int nfs4svc_decode_compoundargs(struct svc_rqst *, __u32 *,
struct nfsd4_compoundargs *);
-int nfs4svc_encode_compoundres(struct svc_rqst *, u32 *,
+int nfs4svc_encode_compoundres(struct svc_rqst *, __u32 *,
struct nfsd4_compoundres *);
void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);
void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op);
int nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
- struct dentry *dentry, u32 *buffer, int *countp,
- u32 *bmval, struct svc_rqst *);
+ struct dentry *dentry, __u32 *buffer, int *countp,
+ __u32 *bmval, struct svc_rqst *);
extern int nfsd4_setclientid(struct svc_rqst *rqstp,
struct nfsd4_setclientid *setclid);
extern int nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/pmu.h 2004-01-17 17:04:31.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/pmu.h 2004-08-26 05:42:08.000000000 -0500
@@ -120,15 +120,15 @@
/* no param */
#define PMU_IOC_SLEEP _IO('B', 0)
-/* out param: u32* backlight value: 0 to 15 */
+/* out param: __u32* backlight value: 0 to 15 */
#define PMU_IOC_GET_BACKLIGHT _IOR('B', 1, size_t)
-/* in param: u32 backlight value: 0 to 15 */
+/* in param: __u32 backlight value: 0 to 15 */
#define PMU_IOC_SET_BACKLIGHT _IOW('B', 2, size_t)
-/* out param: u32* PMU model */
+/* out param: __u32* PMU model */
#define PMU_IOC_GET_MODEL _IOR('B', 3, size_t)
-/* out param: u32* has_adb: 0 or 1 */
+/* out param: __u32* has_adb: 0 or 1 */
#define PMU_IOC_HAS_ADB _IOR('B', 4, size_t)
-/* out param: u32* can_sleep: 0 or 1 */
+/* out param: __u32* can_sleep: 0 or 1 */
#define PMU_IOC_CAN_SLEEP _IOR('B', 5, size_t)
/* no param, but historically was _IOR('B', 6, 0), meaning 4 bytes */
#define PMU_IOC_GRAB_BACKLIGHT _IOR('B', 6, size_t)
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/reiserfs_fs.h 2004-08-18 13:16:04.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/reiserfs_fs.h 2004-08-26 13:26:06.000000000 -0500
@@ -1821,7 +1821,7 @@
* to use for a new object underneat it. The locality is returned
* in disk byte order (le).
*/
-u32 reiserfs_choose_packing(struct inode *dir);
+__u32 reiserfs_choose_packing(struct inode *dir);
int is_reusable (struct super_block * s, b_blocknr_t block, int bit_value);
void reiserfs_free_block (struct reiserfs_transaction_handle *th, struct inode *, b_blocknr_t, int for_unformatted);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/scx200_gpio.h 2004-01-17 17:04:32.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/scx200_gpio.h 2004-08-26 13:26:01.000000000 -0500
@@ -1,5 +1,5 @@
-u32 scx200_gpio_configure(int index, u32 set, u32 clear);
+__u32 scx200_gpio_configure(int index, __u32 set, __u32 clear);
void scx200_gpio_dump(unsigned index);
extern unsigned scx200_gpio_base;
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sdladrv.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sdladrv.h 2004-08-26 05:42:08.000000000 -0500
@@ -55,8 +55,8 @@
extern int sdla_inten (sdlahw_t* hw);
extern int sdla_intde (sdlahw_t* hw);
extern int sdla_intack (sdlahw_t* hw);
-extern void S514_intack (sdlahw_t* hw, u32 int_status);
-extern void read_S514_int_stat (sdlahw_t* hw, u32* int_status);
+extern void S514_intack (sdlahw_t* hw, __u32 int_status);
+extern void read_S514_int_stat (sdlahw_t* hw, __u32* int_status);
extern int sdla_intr (sdlahw_t* hw);
extern int sdla_mapmem (sdlahw_t* hw, unsigned long addr);
extern int sdla_peek (sdlahw_t* hw, unsigned long addr, void* buf,
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/selection.h 2004-06-23 16:52:56.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/selection.h 2004-08-26 05:42:08.000000000 -0500
@@ -32,14 +32,14 @@
extern int default_blu[];
extern unsigned short *screen_pos(int currcons, int w_offset, int viewed);
-extern u16 screen_glyph(int currcons, int offset);
+extern __u16 screen_glyph(int currcons, int offset);
extern void complement_pos(int currcons, int offset);
extern void invert_screen(int currcons, int offset, int count, int shift);
extern void getconsxy(int currcons, unsigned char *p);
extern void putconsxy(int currcons, unsigned char *p);
-extern u16 vcs_scr_readw(int currcons, const u16 *org);
-extern void vcs_scr_writew(int currcons, u16 val, u16 *org);
+extern __u16 vcs_scr_readw(int currcons, const __u16 *org);
+extern void vcs_scr_writew(int currcons, __u16 val, __u16 *org);
#endif
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/serialP.h 2004-08-18 13:16:04.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/serialP.h 2004-08-26 05:42:08.000000000 -0500
@@ -39,8 +39,8 @@
int xmit_fifo_size;
int custom_divisor;
int count;
- u8 *iomem_base;
- u16 iomem_reg_shift;
+ __u8 *iomem_base;
+ __u16 iomem_reg_shift;
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
struct async_icount icount;
@@ -75,8 +75,8 @@
int blocked_open; /* # of blocked opens */
struct circ_buf xmit;
spinlock_t xmit_lock;
- u8 *iomem_base;
- u16 iomem_reg_shift;
+ __u8 *iomem_base;
+ __u16 iomem_reg_shift;
int io_type;
struct work_struct work;
struct tasklet_struct tlet;
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/clnt.h 2004-02-29 10:36:05.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/clnt.h 2004-08-26 05:42:08.000000000 -0500
@@ -36,7 +36,7 @@
atomic_t cl_users; /* number of references */
struct rpc_xprt * cl_xprt; /* transport */
struct rpc_procinfo * cl_procinfo; /* procedure info */
- u32 cl_maxproc; /* max procedure number */
+ __u32 cl_maxproc; /* max procedure number */
char * cl_server; /* server machine name */
char * cl_protname; /* protocol name */
@@ -75,7 +75,7 @@
#define RPC_MAXVERSION 4
struct rpc_program {
char * name; /* protocol name */
- u32 number; /* program number */
+ __u32 number; /* program number */
unsigned int nrvers; /* number of versions */
struct rpc_version ** version; /* version array */
struct rpc_stat * stats; /* statistics */
@@ -83,7 +83,7 @@
};
struct rpc_version {
- u32 number; /* version number */
+ __u32 number; /* version number */
unsigned int nrprocs; /* number of procs */
struct rpc_procinfo * procs; /* procedure array */
};
@@ -92,7 +92,7 @@
* Procedure information
*/
struct rpc_procinfo {
- u32 p_proc; /* RPC procedure number */
+ __u32 p_proc; /* RPC procedure number */
kxdrproc_t p_encode; /* XDR encode function */
kxdrproc_t p_decode; /* XDR decode function */
unsigned int p_bufsiz; /* req. buffer size */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_asn1.h 2004-06-23 16:52:58.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_asn1.h 2004-08-26 13:26:25.000000000 -0500
@@ -64,14 +64,14 @@
(((o1)->len == (o2)->len) && \
(memcmp((o1)->data,(o2)->data,(int) (o1)->len) == 0))
-u32 g_verify_token_header(
+__u32 g_verify_token_header(
struct xdr_netobj *mech,
int *body_size,
unsigned char **buf_in,
int tok_type,
int toksize);
-u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf);
+__u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf);
int g_token_size(
struct xdr_netobj *mech,
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_krb5.h 2004-06-23 16:52:58.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_krb5.h 2004-08-26 13:26:21.000000000 -0500
@@ -46,8 +46,8 @@
int sealalg;
struct crypto_tfm *enc;
struct crypto_tfm *seq;
- s32 endtime;
- u32 seq_send;
+ __s32 endtime;
+ __u32 seq_send;
struct xdr_netobj mech_used;
};
@@ -112,35 +112,35 @@
#define ENCTYPE_DES3_CBC_SHA1 0x0010
#define ENCTYPE_UNKNOWN 0x01ff
-s32
-make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
+__s32
+make_checksum(__s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
struct xdr_netobj *cksum);
-u32
+__u32
krb5_make_token(struct krb5_ctx *context_handle, int qop_req,
struct xdr_buf *input_message_buffer,
struct xdr_netobj *output_message_buffer, int toktype);
-u32
+__u32
krb5_read_token(struct krb5_ctx *context_handle,
struct xdr_netobj *input_token_buffer,
struct xdr_buf *message_buffer,
int *qop_state, int toktype);
-u32
+__u32
krb5_encrypt(struct crypto_tfm * key,
void *iv, void *in, void *out, int length);
-u32
+__u32
krb5_decrypt(struct crypto_tfm * key,
void *iv, void *in, void *out, int length);
-s32
+__s32
krb5_make_seq_num(struct crypto_tfm * key,
int direction,
- s32 seqnum, unsigned char *cksum, unsigned char *buf);
+ __s32 seqnum, unsigned char *cksum, unsigned char *buf);
-s32
+__s32
krb5_get_seq_num(struct crypto_tfm * key,
unsigned char *cksum,
- unsigned char *buf, int *direction, s32 * seqnum);
+ unsigned char *buf, int *direction, __s32 * seqnum);
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/svc.h 2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/svc.h 2004-08-26 05:42:08.000000000 -0500
@@ -75,20 +75,20 @@
*/
#define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2)
-static inline u32 svc_getu32(struct kvec *iov)
+static inline __u32 svc_getu32(struct kvec *iov)
{
- u32 val, *vp;
+ __u32 val, *vp;
vp = iov->iov_base;
val = *vp++;
iov->iov_base = (void*)vp;
- iov->iov_len -= sizeof(u32);
+ iov->iov_len -= sizeof(__u32);
return val;
}
-static inline void svc_putu32(struct kvec *iov, u32 val)
+static inline void svc_putu32(struct kvec *iov, __u32 val)
{
- u32 *vp = iov->iov_base + iov->iov_len;
+ __u32 *vp = iov->iov_base + iov->iov_len;
*vp = val;
- iov->iov_len += sizeof(u32);
+ iov->iov_len += sizeof(__u32);
}
@@ -119,11 +119,11 @@
short rq_arghi; /* pages available in argument page list */
short rq_resused; /* pages used for result */
- u32 rq_xid; /* transmission id */
- u32 rq_prog; /* program number */
- u32 rq_vers; /* program version */
- u32 rq_proc; /* procedure number */
- u32 rq_prot; /* IP protocol */
+ __u32 rq_xid; /* transmission id */
+ __u32 rq_prog; /* program number */
+ __u32 rq_vers; /* program version */
+ __u32 rq_proc; /* procedure number */
+ __u32 rq_prot; /* IP protocol */
unsigned short
rq_secure : 1; /* secure port */
@@ -156,7 +156,7 @@
* Check buffer bounds after decoding arguments
*/
static inline int
-xdr_argsize_check(struct svc_rqst *rqstp, u32 *p)
+xdr_argsize_check(struct svc_rqst *rqstp, __u32 *p)
{
char *cp = (char *)p;
struct kvec *vec = &rqstp->rq_arg.head[0];
@@ -164,7 +164,7 @@
}
static inline int
-xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
+xdr_ressize_check(struct svc_rqst *rqstp, __u32 *p)
{
struct kvec *vec = &rqstp->rq_res.head[0];
char *cp = (char*)p;
@@ -220,19 +220,19 @@
}
struct svc_deferred_req {
- u32 prot; /* protocol (UDP or TCP) */
+ __u32 prot; /* protocol (UDP or TCP) */
struct sockaddr_in addr;
struct svc_sock *svsk; /* where reply must go */
struct cache_deferred_req handle;
int argslen;
- u32 args[0];
+ __u32 args[0];
};
/*
* RPC program
*/
struct svc_program {
- u32 pg_prog; /* program number */
+ __u32 pg_prog; /* program number */
unsigned int pg_lovers; /* lowest version */
unsigned int pg_hivers; /* lowest version */
unsigned int pg_nvers; /* number of versions */
@@ -246,16 +246,16 @@
* RPC program version
*/
struct svc_version {
- u32 vs_vers; /* version number */
- u32 vs_nproc; /* number of procedures */
+ __u32 vs_vers; /* version number */
+ __u32 vs_nproc; /* number of procedures */
struct svc_procedure * vs_proc; /* per-procedure info */
- u32 vs_xdrsize; /* xdrsize needed for this version */
+ __u32 vs_xdrsize; /* xdrsize needed for this version */
/* Override dispatch function (e.g. when caching replies).
* A return value of 0 means drop the request.
* vs_dispatch == NULL means use default dispatcher.
*/
- int (*vs_dispatch)(struct svc_rqst *, u32 *);
+ int (*vs_dispatch)(struct svc_rqst *, __u32 *);
};
/*
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/xprt.h 2004-06-23 16:52:58.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/xprt.h 2004-08-26 05:42:08.000000000 -0500
@@ -93,7 +93,7 @@
__u32 rq_xid; /* request XID */
int rq_cong; /* has incremented xprt->cong */
int rq_received; /* receive completed */
- u32 rq_seqno; /* gss seq no. used on req. */
+ __u32 rq_seqno; /* gss seq no. used on req. */
struct list_head rq_list;
@@ -106,13 +106,13 @@
/*
* For authentication (e.g. auth_des)
*/
- u32 rq_creddata[2];
+ __u32 rq_creddata[2];
/*
* Partial send handling
*/
- u32 rq_bytes_sent; /* Bytes we have sent */
+ __u32 rq_bytes_sent; /* Bytes we have sent */
unsigned long rq_xtime; /* when transmitted */
int rq_ntrans;
@@ -160,7 +160,7 @@
/*
* State of TCP reply receive stuff
*/
- u32 tcp_recm, /* Fragment header */
+ __u32 tcp_recm, /* Fragment header */
tcp_xid, /* Current XID */
tcp_reclen, /* fragment length */
tcp_offset; /* fragment offset */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/suspend.h 2004-08-18 13:16:05.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/suspend.h 2004-08-26 05:42:08.000000000 -0500
@@ -23,7 +23,7 @@
#define SWAP_FILENAME_MAXLENGTH 32
struct suspend_header {
- u32 version_code;
+ __u32 version_code;
unsigned long num_physpages;
char machine[8];
char version[20];
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sysdev.h 2004-03-28 07:52:11.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sysdev.h 2004-08-26 05:42:08.000000000 -0500
@@ -31,7 +31,7 @@
/* Default operations for these types of devices */
int (*shutdown)(struct sys_device *);
- int (*suspend)(struct sys_device *, u32 state);
+ int (*suspend)(struct sys_device *, __u32 state);
int (*resume)(struct sys_device *);
struct kset kset;
};
@@ -50,7 +50,7 @@
int (*add)(struct sys_device *);
int (*remove)(struct sys_device *);
int (*shutdown)(struct sys_device *);
- int (*suspend)(struct sys_device *, u32 state);
+ int (*suspend)(struct sys_device *, __u32 state);
int (*resume)(struct sys_device *);
};
@@ -65,7 +65,7 @@
*/
struct sys_device {
- u32 id;
+ __u32 id;
struct sysdev_class * cls;
struct kobject kobj;
};
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/sysv_fs.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sysv_fs.h 2004-08-26 05:42:08.000000000 -0500
@@ -9,12 +9,12 @@
/* inode numbers are 16 bit */
-typedef u16 sysv_ino_t;
+typedef __u16 sysv_ino_t;
/* Block numbers are 24 bit, sometimes stored in 32 bit.
On Coherent FS, they are always stored in PDP-11 manner: the least
significant 16 bits come last. */
-typedef u32 sysv_zone_t;
+typedef __u32 sysv_zone_t;
/* 0 is non-existent */
#define SYSV_BADBL_INO 1 /* inode of bad blocks file */
@@ -25,29 +25,29 @@
#define XENIX_NICINOD 100 /* number of inode cache entries */
#define XENIX_NICFREE 100 /* number of free block list chunk entries */
struct xenix_super_block {
- u16 s_isize; /* index of first data zone */
- u32 s_fsize __packed2__; /* total number of zones of this fs */
+ __u16 s_isize; /* index of first data zone */
+ __u32 s_fsize __packed2__; /* total number of zones of this fs */
/* the start of the free block list: */
- u16 s_nfree; /* number of free blocks in s_free, <= XENIX_NICFREE */
- u32 s_free[XENIX_NICFREE]; /* first free block list chunk */
+ __u16 s_nfree; /* number of free blocks in s_free, <= XENIX_NICFREE */
+ __u32 s_free[XENIX_NICFREE]; /* first free block list chunk */
/* the cache of free inodes: */
- u16 s_ninode; /* number of free inodes in s_inode, <= XENIX_NICINOD */
+ __u16 s_ninode; /* number of free inodes in s_inode, <= XENIX_NICINOD */
sysv_ino_t s_inode[XENIX_NICINOD]; /* some free inodes */
/* locks, not used by Linux: */
char s_flock; /* lock during free block list manipulation */
char s_ilock; /* lock during inode cache manipulation */
char s_fmod; /* super-block modified flag */
char s_ronly; /* flag whether fs is mounted read-only */
- u32 s_time __packed2__; /* time of last super block update */
- u32 s_tfree __packed2__; /* total number of free zones */
- u16 s_tinode; /* total number of free inodes */
- s16 s_dinfo[4]; /* device information ?? */
+ __u32 s_time __packed2__; /* time of last super block update */
+ __u32 s_tfree __packed2__; /* total number of free zones */
+ __u16 s_tinode; /* total number of free inodes */
+ __s16 s_dinfo[4]; /* device information ?? */
char s_fname[6]; /* file system volume name */
char s_fpack[6]; /* file system pack name */
char s_clean; /* set to 0x46 when filesystem is properly unmounted */
char s_fill[371];
- s32 s_magic; /* version of file system */
- s32 s_type; /* type of file system: 1 for 512 byte blocks
+ __s32 s_magic; /* version of file system */
+ __s32 s_type; /* type of file system: 1 for 512 byte blocks
2 for 1024 byte blocks
3 for 2048 byte blocks */
@@ -63,61 +63,61 @@
/* SystemV4 super-block data on disk */
struct sysv4_super_block {
- u16 s_isize; /* index of first data zone */
- u16 s_pad0;
- u32 s_fsize; /* total number of zones of this fs */
+ __u16 s_isize; /* index of first data zone */
+ __u16 s_pad0;
+ __u32 s_fsize; /* total number of zones of this fs */
/* the start of the free block list: */
- u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
- u16 s_pad1;
- u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
+ __u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
+ __u16 s_pad1;
+ __u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
/* the cache of free inodes: */
- u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
- u16 s_pad2;
+ __u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
+ __u16 s_pad2;
sysv_ino_t s_inode[SYSV_NICINOD]; /* some free inodes */
/* locks, not used by Linux: */
char s_flock; /* lock during free block list manipulation */
char s_ilock; /* lock during inode cache manipulation */
char s_fmod; /* super-block modified flag */
char s_ronly; /* flag whether fs is mounted read-only */
- u32 s_time; /* time of last super block update */
- s16 s_dinfo[4]; /* device information ?? */
- u32 s_tfree; /* total number of free zones */
- u16 s_tinode; /* total number of free inodes */
- u16 s_pad3;
+ __u32 s_time; /* time of last super block update */
+ __s16 s_dinfo[4]; /* device information ?? */
+ __u32 s_tfree; /* total number of free zones */
+ __u16 s_tinode; /* total number of free inodes */
+ __u16 s_pad3;
char s_fname[6]; /* file system volume name */
char s_fpack[6]; /* file system pack name */
- s32 s_fill[12];
- s32 s_state; /* file system state: 0x7c269d38-s_time means clean */
- s32 s_magic; /* version of file system */
- s32 s_type; /* type of file system: 1 for 512 byte blocks
+ __s32 s_fill[12];
+ __s32 s_state; /* file system state: 0x7c269d38-s_time means clean */
+ __s32 s_magic; /* version of file system */
+ __s32 s_type; /* type of file system: 1 for 512 byte blocks
2 for 1024 byte blocks */
};
/* SystemV2 super-block data on disk */
struct sysv2_super_block {
- u16 s_isize; /* index of first data zone */
- u32 s_fsize __packed2__; /* total number of zones of this fs */
+ __u16 s_isize; /* index of first data zone */
+ __u32 s_fsize __packed2__; /* total number of zones of this fs */
/* the start of the free block list: */
- u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
- u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
+ __u16 s_nfree; /* number of free blocks in s_free, <= SYSV_NICFREE */
+ __u32 s_free[SYSV_NICFREE]; /* first free block list chunk */
/* the cache of free inodes: */
- u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
+ __u16 s_ninode; /* number of free inodes in s_inode, <= SYSV_NICINOD */
sysv_ino_t s_inode[SYSV_NICINOD]; /* some free inodes */
/* locks, not used by Linux: */
char s_flock; /* lock during free block list manipulation */
char s_ilock; /* lock during inode cache manipulation */
char s_fmod; /* super-block modified flag */
char s_ronly; /* flag whether fs is mounted read-only */
- u32 s_time __packed2__; /* time of last super block update */
- s16 s_dinfo[4]; /* device information ?? */
- u32 s_tfree __packed2__; /* total number of free zones */
- u16 s_tinode; /* total number of free inodes */
+ __u32 s_time __packed2__; /* time of last super block update */
+ __s16 s_dinfo[4]; /* device information ?? */
+ __u32 s_tfree __packed2__; /* total number of free zones */
+ __u16 s_tinode; /* total number of free inodes */
char s_fname[6]; /* file system volume name */
char s_fpack[6]; /* file system pack name */
- s32 s_fill[14];
- s32 s_state; /* file system state: 0xcb096f43 means clean */
- s32 s_magic; /* version of file system */
- s32 s_type; /* type of file system: 1 for 512 byte blocks
+ __s32 s_fill[14];
+ __s32 s_state; /* file system state: 0xcb096f43 means clean */
+ __s32 s_magic; /* version of file system */
+ __s32 s_type; /* type of file system: 1 for 512 byte blocks
2 for 1024 byte blocks */
};
@@ -125,25 +125,25 @@
#define V7_NICINOD 100 /* number of inode cache entries */
#define V7_NICFREE 50 /* number of free block list chunk entries */
struct v7_super_block {
- u16 s_isize; /* index of first data zone */
- u32 s_fsize __packed2__; /* total number of zones of this fs */
+ __u16 s_isize; /* index of first data zone */
+ __u32 s_fsize __packed2__; /* total number of zones of this fs */
/* the start of the free block list: */
- u16 s_nfree; /* number of free blocks in s_free, <= V7_NICFREE */
- u32 s_free[V7_NICFREE]; /* first free block list chunk */
+ __u16 s_nfree; /* number of free blocks in s_free, <= V7_NICFREE */
+ __u32 s_free[V7_NICFREE]; /* first free block list chunk */
/* the cache of free inodes: */
- u16 s_ninode; /* number of free inodes in s_inode, <= V7_NICINOD */
+ __u16 s_ninode; /* number of free inodes in s_inode, <= V7_NICINOD */
sysv_ino_t s_inode[V7_NICINOD]; /* some free inodes */
/* locks, not used by Linux or V7: */
char s_flock; /* lock during free block list manipulation */
char s_ilock; /* lock during inode cache manipulation */
char s_fmod; /* super-block modified flag */
char s_ronly; /* flag whether fs is mounted read-only */
- u32 s_time __packed2__; /* time of last super block update */
+ __u32 s_time __packed2__; /* time of last super block update */
/* the following fields are not maintained by V7: */
- u32 s_tfree __packed2__; /* total number of free zones */
- u16 s_tinode; /* total number of free inodes */
- u16 s_m; /* interleave factor */
- u16 s_n; /* interleave factor */
+ __u32 s_tfree __packed2__; /* total number of free zones */
+ __u16 s_tinode; /* total number of free inodes */
+ __u16 s_m; /* interleave factor */
+ __u16 s_n; /* interleave factor */
char s_fname[6]; /* file system name */
char s_fpack[6]; /* file system pack name */
};
@@ -152,41 +152,41 @@
#define COH_NICINOD 100 /* number of inode cache entries */
#define COH_NICFREE 64 /* number of free block list chunk entries */
struct coh_super_block {
- u16 s_isize; /* index of first data zone */
- u32 s_fsize __packed2__; /* total number of zones of this fs */
+ __u16 s_isize; /* index of first data zone */
+ __u32 s_fsize __packed2__; /* total number of zones of this fs */
/* the start of the free block list: */
- u16 s_nfree; /* number of free blocks in s_free, <= COH_NICFREE */
- u32 s_free[COH_NICFREE] __packed2__; /* first free block list chunk */
+ __u16 s_nfree; /* number of free blocks in s_free, <= COH_NICFREE */
+ __u32 s_free[COH_NICFREE] __packed2__; /* first free block list chunk */
/* the cache of free inodes: */
- u16 s_ninode; /* number of free inodes in s_inode, <= COH_NICINOD */
+ __u16 s_ninode; /* number of free inodes in s_inode, <= COH_NICINOD */
sysv_ino_t s_inode[COH_NICINOD]; /* some free inodes */
/* locks, not used by Linux: */
char s_flock; /* lock during free block list manipulation */
char s_ilock; /* lock during inode cache manipulation */
char s_fmod; /* super-block modified flag */
char s_ronly; /* flag whether fs is mounted read-only */
- u32 s_time __packed2__; /* time of last super block update */
- u32 s_tfree __packed2__; /* total number of free zones */
- u16 s_tinode; /* total number of free inodes */
- u16 s_interleave_m; /* interleave factor */
- u16 s_interleave_n;
+ __u32 s_time __packed2__; /* time of last super block update */
+ __u32 s_tfree __packed2__; /* total number of free zones */
+ __u16 s_tinode; /* total number of free inodes */
+ __u16 s_interleave_m; /* interleave factor */
+ __u16 s_interleave_n;
char s_fname[6]; /* file system volume name */
char s_fpack[6]; /* file system pack name */
- u32 s_unique; /* zero, not used */
+ __u32 s_unique; /* zero, not used */
};
/* SystemV/Coherent inode data on disk */
struct sysv_inode {
- u16 i_mode;
- u16 i_nlink;
- u16 i_uid;
- u16 i_gid;
- u32 i_size;
- u8 i_data[3*(10+1+1+1)];
- u8 i_gen;
- u32 i_atime; /* time of last access */
- u32 i_mtime; /* time of last modification */
- u32 i_ctime; /* time of creation */
+ __u16 i_mode;
+ __u16 i_nlink;
+ __u16 i_uid;
+ __u16 i_gid;
+ __u32 i_size;
+ __u8 i_data[3*(10+1+1+1)];
+ __u8 i_gen;
+ __u32 i_atime; /* time of last access */
+ __u32 i_mtime; /* time of last modification */
+ __u32 i_ctime; /* time of creation */
};
/* SystemV/Coherent directory entry on disk */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/tiocl.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/tiocl.h 2004-08-26 05:42:08.000000000 -0500
@@ -23,7 +23,7 @@
#define TIOCL_SELLOADLUT 5
/* set characters to be considered alphabetic when selecting */
- /* u32[8] bit array, 4 bytes-aligned with type */
+ /* __u32[8] bit array, 4 bytes-aligned with type */
/* these two don't return a value: they write it back in the type */
#define TIOCL_GETSHIFTSTATE 6 /* write shift state */
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/umem.h 2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/umem.h 2004-08-26 05:42:08.000000000 -0500
@@ -110,19 +110,19 @@
#define DMA_WRITE_TO_HOST 1
struct mm_dma_desc {
- u64 pci_addr;
- u64 local_addr;
- u32 transfer_size;
- u32 zero1;
- u64 next_desc_addr;
- u64 sem_addr;
- u32 control_bits;
- u32 zero2;
+ __u64 pci_addr;
+ __u64 local_addr;
+ __u32 transfer_size;
+ __u32 zero1;
+ __u64 next_desc_addr;
+ __u64 sem_addr;
+ __u32 control_bits;
+ __u32 zero2;
dma_addr_t data_dma_handle;
/* Copy of the bits */
- u64 sem_control_bits;
+ __u64 sem_control_bits;
} __attribute__((aligned(8)));
#define PCI_VENDOR_ID_MICRO_MEMORY 0x1332
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
--- linux-libc-headers-2.6.8.0-dist/include/linux/vt_buffer.h 2004-01-17 17:04:33.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/vt_buffer.h 2004-08-26 05:42:08.000000000 -0500
@@ -28,7 +28,7 @@
#endif
#ifndef VT_BUF_HAVE_MEMSETW
-static inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
+static inline void scr_memsetw(__u16 *s, __u16 c, unsigned int count)
{
count /= 2;
while (count--)
@@ -37,7 +37,7 @@
#endif
#ifndef VT_BUF_HAVE_MEMCPYW
-static inline void scr_memcpyw(u16 *d, const u16 *s, unsigned int count)
+static inline void scr_memcpyw(__u16 *d, const __u16 *s, unsigned int count)
{
count /= 2;
while (count--)
@@ -46,7 +46,7 @@
#endif
#ifndef VT_BUF_HAVE_MEMMOVEW
-static inline void scr_memmovew(u16 *d, const u16 *s, unsigned int count)
+static inline void scr_memmovew(__u16 *d, const __u16 *s, unsigned int count)
{
if (d < s)
scr_memcpyw(d, s, count);
Reference in New Issue Copy Permalink