📄 linux-libc-headers-2.6.8-cleanup.patch
字号:
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 languagediff -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); #endifdiff -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 shutdowndiff -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); #endifdiff -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 /*⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -