From 8ebebe7e61c75c2ce68700648177d7241caf8d5e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 25 Mar 2008 18:36:26 -0300 Subject: [PATCH] --- yaml --- r: 90999 b: refs/heads/master c: 9231b269e09ed60910c159cf668f887623b7ac58 h: refs/heads/master i: 90997: 7aae2c6169598c548bdd2a749d209580330d2ea6 90995: 9c177d57fdc29c8c401ae48bc692da31c553bf36 90991: 53c90bfae223e78143166d0e5407f36a6d8fb0af v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-base_32.c | 1 + trunk/include/asm-x86/dma-mapping.h | 11 +++++++++++ trunk/include/asm-x86/dma-mapping_32.h | 7 ------- trunk/include/asm-x86/dma-mapping_64.h | 11 ----------- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index d0d6cef064c1..0d85f1f30bec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c01dd8cf7d19b869af1668c80a34a955c871f607 +refs/heads/master: 9231b269e09ed60910c159cf668f887623b7ac58 diff --git a/trunk/arch/x86/kernel/pci-base_32.c b/trunk/arch/x86/kernel/pci-base_32.c index dce03c81bb25..36488245e361 100644 --- a/trunk/arch/x86/kernel/pci-base_32.c +++ b/trunk/arch/x86/kernel/pci-base_32.c @@ -36,6 +36,7 @@ static const struct dma_mapping_ops pci32_dma_ops = { .map_sg = pci32_dma_map_sg, .unmap_sg = NULL, .sync_single_for_cpu = NULL, + .sync_single_for_device = NULL, }; const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h index 507069d231dd..8ad582c2080a 100644 --- a/trunk/include/asm-x86/dma-mapping.h +++ b/trunk/include/asm-x86/dma-mapping.h @@ -103,4 +103,15 @@ dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle, flush_write_buffers(); } +static inline void +dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, + size_t size, int direction) +{ + BUG_ON(!valid_dma_direction(direction)); + if (dma_ops->sync_single_for_device) + dma_ops->sync_single_for_device(hwdev, dma_handle, size, + direction); + flush_write_buffers(); +} + #endif diff --git a/trunk/include/asm-x86/dma-mapping_32.h b/trunk/include/asm-x86/dma-mapping_32.h index a05b2fc810bb..b91771a6a0bd 100644 --- a/trunk/include/asm-x86/dma-mapping_32.h +++ b/trunk/include/asm-x86/dma-mapping_32.h @@ -32,13 +32,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, BUG_ON(!valid_dma_direction(direction)); } -static inline void -dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, - enum dma_data_direction direction) -{ - flush_write_buffers(); -} - static inline void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, unsigned long offset, size_t size, diff --git a/trunk/include/asm-x86/dma-mapping_64.h b/trunk/include/asm-x86/dma-mapping_64.h index b055964d1a27..b539f61f3c78 100644 --- a/trunk/include/asm-x86/dma-mapping_64.h +++ b/trunk/include/asm-x86/dma-mapping_64.h @@ -28,17 +28,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr, #define dma_unmap_page dma_unmap_single -static inline void -dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, - size_t size, int direction) -{ - BUG_ON(!valid_dma_direction(direction)); - if (dma_ops->sync_single_for_device) - dma_ops->sync_single_for_device(hwdev, dma_handle, size, - direction); - flush_write_buffers(); -} - static inline void dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, unsigned long offset, size_t size, int direction)