patch-2.4.10 linux/include/asm-mips/pci.h
Next file: linux/include/asm-mips/pci_channel.h
Previous file: linux/include/asm-mips/module.h
Back to the patch index
Back to the overall index
- Lines: 51
- Date:
Sun Sep 9 10:43:01 2001
- Orig file:
v2.4.9/linux/include/asm-mips/pci.h
- Orig date:
Tue Jul 3 17:08:21 2001
diff -u --recursive --new-file v2.4.9/linux/include/asm-mips/pci.h linux/include/asm-mips/pci.h
@@ -6,14 +6,19 @@
#ifndef _ASM_PCI_H
#define _ASM_PCI_H
+#include <linux/config.h>
+
#ifdef __KERNEL__
/* Can be used to override the logic in pci_scan_bus for skipping
already-configured bus numbers - to be used for buggy BIOSes
or architectures with incomplete PCI setup by the loader */
-//#define pcibios_assign_all_busses() 0
-#define pcibios_assign_all_busses() 1
+#ifdef CONFIG_PCI
+extern unsigned int pcibios_assign_all_busses(void);
+#else
+#define pcibios_assign_all_busses() 0
+#endif
#define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x10000000
@@ -85,7 +90,9 @@
if (direction == PCI_DMA_NONE)
BUG();
+#ifndef CONFIG_COHERENT_IO
dma_cache_wback_inv((unsigned long)ptr, size);
+#endif
return virt_to_bus(ptr);
}
@@ -173,7 +180,9 @@
if (direction == PCI_DMA_NONE)
BUG();
+#ifndef CONFIG_COHERENT_IO
dma_cache_wback_inv((unsigned long)bus_to_virt(dma_handle), size);
+#endif
}
/*
@@ -213,7 +222,7 @@
* so we can't guarantee allocations that must be
* within a tighter range than GFP_DMA..
*/
- if (mask < 0x00ffffff)
+ if (mask < 0x1fffffff)
return 0;
return 1;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)