diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2009-06-12 03:53:47 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2009-06-12 05:32:58 -0400 |
| commit | 5b02ee3d219f9e01b6e9146e25613822cfc2e5ce (patch) | |
| tree | 7ce9126738c3cf4b37d67170d0e4b34818c057a9 /arch/frv/include/asm/pci.h | |
| parent | 26a28fa4fea5b8c65713aa50c124f76a88c7924d (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
asm-generic: merge branch 'master' of torvalds/linux-2.6
Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/frv/include/asm/pci.h')
| -rw-r--r-- | arch/frv/include/asm/pci.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h index 3ce227ba7744..492b5c4dfed6 100644 --- a/arch/frv/include/asm/pci.h +++ b/arch/frv/include/asm/pci.h | |||
| @@ -81,8 +81,7 @@ static inline void pci_dma_sync_single(struct pci_dev *hwdev, | |||
| 81 | dma_addr_t dma_handle, | 81 | dma_addr_t dma_handle, |
| 82 | size_t size, int direction) | 82 | size_t size, int direction) |
| 83 | { | 83 | { |
| 84 | if (direction == PCI_DMA_NONE) | 84 | BUG_ON(direction == PCI_DMA_NONE); |
| 85 | BUG(); | ||
| 86 | 85 | ||
| 87 | frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle), | 86 | frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle), |
| 88 | (unsigned long)bus_to_virt(dma_handle) + size); | 87 | (unsigned long)bus_to_virt(dma_handle) + size); |
| @@ -99,9 +98,7 @@ static inline void pci_dma_sync_sg(struct pci_dev *hwdev, | |||
| 99 | int nelems, int direction) | 98 | int nelems, int direction) |
| 100 | { | 99 | { |
| 101 | int i; | 100 | int i; |
| 102 | 101 | BUG_ON(direction == PCI_DMA_NONE); | |
| 103 | if (direction == PCI_DMA_NONE) | ||
| 104 | BUG(); | ||
| 105 | 102 | ||
| 106 | for (i = 0; i < nelems; i++) | 103 | for (i = 0; i < nelems; i++) |
| 107 | frv_cache_wback_inv(sg_dma_address(&sg[i]), | 104 | frv_cache_wback_inv(sg_dma_address(&sg[i]), |