diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 11:27:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 11:27:53 -0800 |
| commit | 455921451a176d90c5cfef898f061bb6fc83faaf (patch) | |
| tree | 0b6b1686fa1370c15e16fb8e1bb419ea6f877bf4 /include | |
| parent | 0782588b63d0a4307fd277b35c449a17bc59ccc0 (diff) | |
| parent | a9e28d9b0b269a68a19e4ff0f6b9473f86b01358 (diff) | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
avr32: dma-mapping.h
[AVR32] Don't use kmap() in flush_icache_page()
[AVR32] Fix bogus ti->flags manipulation in debug handler
[AVR32] Fix typo in include/asm-avr32/Kbuild
[AVR32] show_trace: Only walk valid stack addresses
[AVR32] at32_spi_setup_slaves should be __init
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/Kbuild | 2 | ||||
| -rw-r--r-- | include/asm-avr32/dma-mapping.h | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/asm-avr32/Kbuild b/include/asm-avr32/Kbuild index 8770e73ce938..3136628ba8d2 100644 --- a/include/asm-avr32/Kbuild +++ b/include/asm-avr32/Kbuild @@ -1,3 +1,3 @@ include include/asm-generic/Kbuild.asm -headers-y += cachectl.h +header-y += cachectl.h diff --git a/include/asm-avr32/dma-mapping.h b/include/asm-avr32/dma-mapping.h index 115813e48fe0..21bb60bbb9a1 100644 --- a/include/asm-avr32/dma-mapping.h +++ b/include/asm-avr32/dma-mapping.h @@ -274,6 +274,24 @@ dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, dma_cache_sync(dev, bus_to_virt(dma_handle), size, direction); } +static inline void +dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single_for_cpu(dev, dma_handle, offset+size, direction); +} + +static inline void +dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single_for_device(dev, dma_handle, offset+size, direction); +} + /** * dma_sync_sg_for_cpu * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices |