Contents of /trunk/linux-libc-headers/patches/linux-2.6.20-mips_headers-1.patch
Parent Directory | Revision Log
Revision 435 -
(show annotations)
(download)
Fri Mar 16 00:06:55 2007 UTC (17 years, 6 months ago) by niro
File size: 3173 byte(s)
Fri Mar 16 00:06:55 2007 UTC (17 years, 6 months ago) by niro
File size: 3173 byte(s)
updated to upstream svn-149
1 | diff -Naur linux-2.6.20/include/asm-mips/io.h linux-mips-2.6.20/include/asm-mips/io.h |
2 | --- linux-2.6.20/include/asm-mips/io.h 2007-02-04 10:44:54.000000000 -0800 |
3 | +++ linux-mips-2.6.20/include/asm-mips/io.h 2007-02-04 12:22:45.000000000 -0800 |
4 | @@ -518,34 +518,6 @@ |
5 | } |
6 | |
7 | /* |
8 | - * Memory Mapped I/O |
9 | - */ |
10 | -#define ioread8(addr) readb(addr) |
11 | -#define ioread16(addr) readw(addr) |
12 | -#define ioread32(addr) readl(addr) |
13 | - |
14 | -#define iowrite8(b,addr) writeb(b,addr) |
15 | -#define iowrite16(w,addr) writew(w,addr) |
16 | -#define iowrite32(l,addr) writel(l,addr) |
17 | - |
18 | -#define ioread8_rep(a,b,c) readsb(a,b,c) |
19 | -#define ioread16_rep(a,b,c) readsw(a,b,c) |
20 | -#define ioread32_rep(a,b,c) readsl(a,b,c) |
21 | - |
22 | -#define iowrite8_rep(a,b,c) writesb(a,b,c) |
23 | -#define iowrite16_rep(a,b,c) writesw(a,b,c) |
24 | -#define iowrite32_rep(a,b,c) writesl(a,b,c) |
25 | - |
26 | -/* Create a virtual mapping cookie for an IO port range */ |
27 | -extern void __iomem *ioport_map(unsigned long port, unsigned int nr); |
28 | -extern void ioport_unmap(void __iomem *); |
29 | - |
30 | -/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ |
31 | -struct pci_dev; |
32 | -extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); |
33 | -extern void pci_iounmap(struct pci_dev *dev, void __iomem *); |
34 | - |
35 | -/* |
36 | * ISA space is 'always mapped' on currently supported MIPS systems, no need |
37 | * to explicitly ioremap() it. The fact that the ISA IO space is mapped |
38 | * to PAGE_OFFSET is pure coincidence - it does not mean ISA values |
39 | diff -Naur linux-2.6.20/include/asm-mips/mach-au1x00/au1000.h linux-mips-2.6.20/include/asm-mips/mach-au1x00/au1000.h |
40 | --- linux-2.6.20/include/asm-mips/mach-au1x00/au1000.h 2007-02-04 10:44:54.000000000 -0800 |
41 | +++ linux-mips-2.6.20/include/asm-mips/mach-au1x00/au1000.h 2007-02-04 12:22:45.000000000 -0800 |
42 | @@ -39,6 +39,7 @@ |
43 | #ifndef _LANGUAGE_ASSEMBLY |
44 | |
45 | #include <linux/delay.h> |
46 | +#include <linux/types.h> |
47 | #include <asm/io.h> |
48 | |
49 | /* cpu pipeline flush */ |
50 | diff -Naur linux-2.6.20/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.20/include/asm-mips/mach-au1x00/au1xxx_ide.h |
51 | --- linux-2.6.20/include/asm-mips/mach-au1x00/au1xxx_ide.h 2007-02-04 10:44:54.000000000 -0800 |
52 | +++ linux-mips-2.6.20/include/asm-mips/mach-au1x00/au1xxx_ide.h 2007-02-04 12:22:45.000000000 -0800 |
53 | @@ -83,6 +83,7 @@ |
54 | } _auide_hwif; |
55 | |
56 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
57 | + |
58 | /* HD white list */ |
59 | static const struct drive_list_entry dma_white_list [] = { |
60 | /* |
61 | diff -Naur linux-2.6.20/include/asm-mips/mach-generic/ide.h linux-mips-2.6.20/include/asm-mips/mach-generic/ide.h |
62 | --- linux-2.6.20/include/asm-mips/mach-generic/ide.h 2007-02-04 10:44:54.000000000 -0800 |
63 | +++ linux-mips-2.6.20/include/asm-mips/mach-generic/ide.h 2007-02-04 12:22:45.000000000 -0800 |
64 | @@ -29,17 +29,12 @@ |
65 | |
66 | #define IDE_ARCH_OBSOLETE_DEFAULTS |
67 | |
68 | +extern int mips_system_has_legacy_ide; |
69 | + |
70 | static __inline__ int ide_probe_legacy(void) |
71 | { |
72 | #ifdef CONFIG_PCI |
73 | - struct pci_dev *dev; |
74 | - if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL || |
75 | - (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) { |
76 | - pci_dev_put(dev); |
77 | - |
78 | - return 1; |
79 | - } |
80 | - return 0; |
81 | + return mips_system_has_legacy_ide; |
82 | #elif defined(CONFIG_EISA) || defined(CONFIG_ISA) |
83 | return 1; |
84 | #else |