diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:41:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:41:58 -0700 |
| commit | 21806261b6cc1068197ea6c8891b857f16260fee (patch) | |
| tree | 79f9e6c27691a0c0b75f3639f85e4ba2babf6726 /include | |
| parent | 5c27d0f11e679e6e5b6b2047b8658409699d4a67 (diff) | |
| parent | dd3aa7cdac35dcdcb93ff5684622664395b0155e (diff) | |
| download | kernel_samsung_crespo-21806261b6cc1068197ea6c8891b857f16260fee.zip kernel_samsung_crespo-21806261b6cc1068197ea6c8891b857f16260fee.tar.gz kernel_samsung_crespo-21806261b6cc1068197ea6c8891b857f16260fee.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Update defconfigs.
sh64: fix dma_cache_sync() compilation
sh64: Move DMA macros from pci.h to scatterlist.h.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh64/dma-mapping.h | 5 | ||||
| -rw-r--r-- | include/asm-sh64/pci.h | 9 | ||||
| -rw-r--r-- | include/asm-sh64/scatterlist.h | 9 |
3 files changed, 12 insertions, 11 deletions
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h index 1438b76..18f8dd6 100644 --- a/include/asm-sh64/dma-mapping.h +++ b/include/asm-sh64/dma-mapping.h @@ -42,8 +42,9 @@ static inline void dma_free_coherent(struct device *dev, size_t size, static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction dir) { - unsigned long s = (unsigned long) vaddr & L1_CACHE_ALIGN_MASK; - unsigned long e = (vaddr + size) & L1_CACHE_ALIGN_MASK; + unsigned long start = (unsigned long) vaddr; + unsigned long s = start & L1_CACHE_ALIGN_MASK; + unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK; for (; s <= e; s += L1_CACHE_BYTES) asm volatile ("ocbp %0, 0" : : "r" (s)); diff --git a/include/asm-sh64/pci.h b/include/asm-sh64/pci.h index 57a67cf..18055db 100644 --- a/include/asm-sh64/pci.h +++ b/include/asm-sh64/pci.h @@ -72,15 +72,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) #endif -/* These macros should be used after a pci_map_sg call has been done - * to get bus addresses of each of the SG entries and their lengths. - * You should only work with the number of sg entries pci_map_sg - * returns, or alternatively stop on the first sg_dma_len(sg) which - * is 0. - */ -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) - #ifdef CONFIG_PCI static inline void pci_dma_burst_advice(struct pci_dev *pdev, enum pci_dma_burst_strategy *strat, diff --git a/include/asm-sh64/scatterlist.h b/include/asm-sh64/scatterlist.h index 5109251..7f729bb 100644 --- a/include/asm-sh64/scatterlist.h +++ b/include/asm-sh64/scatterlist.h @@ -23,6 +23,15 @@ struct scatterlist { unsigned int length; }; +/* These macros should be used after a pci_map_sg call has been done + * to get bus addresses of each of the SG entries and their lengths. + * You should only work with the number of sg entries pci_map_sg + * returns, or alternatively stop on the first sg_dma_len(sg) which + * is 0. + */ +#define sg_dma_address(sg) ((sg)->dma_address) +#define sg_dma_len(sg) ((sg)->length) + #define ISA_DMA_THRESHOLD (0xffffffff) #endif /* !__ASM_SH64_SCATTERLIST_H */ |