[PATCH] mips: fix coherency configuration
Fix the MIPS coherency configuration such that we always keep the mapping state in <asm/pci.h> when we need to on non-coherent platforms. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
42a3b4f25a
commit
4ce588cd56
@@ -94,7 +94,7 @@ struct pci_dev;
|
||||
*/
|
||||
extern unsigned int PCI_DMA_BUS_IS_PHYS;
|
||||
|
||||
#ifdef CONFIG_MAPPED_DMA_IO
|
||||
#ifdef CONFIG_DMA_NEED_PCI_MAP_STATE
|
||||
|
||||
/* pci_unmap_{single,page} is not a nop, thus... */
|
||||
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME;
|
||||
@@ -104,7 +104,7 @@ extern unsigned int PCI_DMA_BUS_IS_PHYS;
|
||||
#define pci_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME)
|
||||
#define pci_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL))
|
||||
|
||||
#else /* CONFIG_MAPPED_DMA_IO */
|
||||
#else /* CONFIG_DMA_NEED_PCI_MAP_STATE */
|
||||
|
||||
/* pci_unmap_{page,single} is a nop so... */
|
||||
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
|
||||
@@ -114,7 +114,7 @@ extern unsigned int PCI_DMA_BUS_IS_PHYS;
|
||||
#define pci_unmap_len(PTR, LEN_NAME) (0)
|
||||
#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
|
||||
|
||||
#endif /* CONFIG_MAPPED_DMA_IO */
|
||||
#endif /* CONFIG_DMA_NEED_PCI_MAP_STATE */
|
||||
|
||||
/* This is always fine. */
|
||||
#define pci_dac_dma_supported(pci_dev, mask) (1)
|
||||
|
Reference in New Issue
Block a user