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