NFS: Fix an unstable write data integrity race

[safe/jmp/linux-2.6] / include / asm-generic / pci.h

diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index c36a77d..26373cf 100644 (file)
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -43,8 +43,6 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res)
        return root;
 }
 
-#define pcibios_scan_all_fns(a, b)     0
-
 #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 {
@@ -52,4 +50,12 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 }
 #endif /* HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ */
 
+/*
+ * By default, assume that no iommu is in use and that the PCI
+ * space is mapped to address physical 0.
+ */
+#ifndef PCI_DMA_BUS_IS_PHYS
+#define PCI_DMA_BUS_IS_PHYS    (1)
 #endif
+
+#endif /* _ASM_GENERIC_PCI_H */