diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-02-05 18:46:40 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-02-05 18:46:40 -0800 |
| commit | cde14bbfb3aa79b479db35bd29e6c083513d8614 (patch) | |
| tree | 68b2d66d1eee3067051f4a6e4df8ace461bf440f /include | |
| parent | 86afa9eb88af2248bcc91d5b3568c63fdea65d6c (diff) | |
| download | kernel_samsung_smdk4412-cde14bbfb3aa79b479db35bd29e6c083513d8614.zip kernel_samsung_smdk4412-cde14bbfb3aa79b479db35bd29e6c083513d8614.tar.gz kernel_samsung_smdk4412-cde14bbfb3aa79b479db35bd29e6c083513d8614.tar.bz2 | |
[IA64] swiotlb bug fixes
This patch fixes
- marking I-cache clean of pages DMAed to now only done for IA64
- broken multiple inclusion in include/asm-x86_64/swiotlb.h
- missing call to mark_clean in swiotlb_sync_sg()
- a (perhaps only theoretical) issue in swiotlb_dma_supported() when
io_tlb_end is exactly at the end of memory
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/dma.h | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/swiotlb.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-ia64/dma.h b/include/asm-ia64/dma.h index dad3a73..4d97f60 100644 --- a/include/asm-ia64/dma.h +++ b/include/asm-ia64/dma.h @@ -19,4 +19,6 @@ extern unsigned long MAX_DMA_ADDRESS; #define free_dma(x) +void dma_mark_clean(void *addr, size_t size); + #endif /* _ASM_IA64_DMA_H */ diff --git a/include/asm-x86_64/swiotlb.h b/include/asm-x86_64/swiotlb.h index ba94ab3..f9c5895 100644 --- a/include/asm-x86_64/swiotlb.h +++ b/include/asm-x86_64/swiotlb.h @@ -1,6 +1,5 @@ #ifndef _ASM_SWIOTLB_H -#define _ASM_SWTIOLB_H 1 - +#define _ASM_SWIOTLB_H 1 #include <asm/dma-mapping.h> @@ -52,4 +51,6 @@ extern int swiotlb; extern void pci_swiotlb_init(void); -#endif /* _ASM_SWTIOLB_H */ +static inline void dma_mark_clean(void *addr, size_t size) {} + +#endif /* _ASM_SWIOTLB_H */ |