From a780e9c460f007098f006be142d19cec5ef724a8 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 14 Feb 2007 00:32:53 -0800 Subject: [PATCH] --- yaml --- r: 48307 b: refs/heads/master c: b7de8e7e3c7b79a72c20c7fd58bd65df3d146b13 h: refs/heads/master i: 48305: 9dbe1b4b15dd4a804ee91fa4c6cd42fe0ea0150c 48303: 28115d9fa1dfd8dc3d4f4eff5f88bbca5b081714 v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/dma-mapping.h | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 30bcf27cad7e..d8da99168fa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac98695d6c1508b724f246f38ce57fb4e3cec356 +refs/heads/master: b7de8e7e3c7b79a72c20c7fd58bd65df3d146b13 diff --git a/trunk/include/asm-ia64/dma-mapping.h b/trunk/include/asm-ia64/dma-mapping.h index ebd5887f4b1a..6299b51575bb 100644 --- a/trunk/include/asm-ia64/dma-mapping.h +++ b/trunk/include/asm-ia64/dma-mapping.h @@ -8,9 +8,20 @@ #include #define dma_alloc_coherent platform_dma_alloc_coherent -#define dma_alloc_noncoherent platform_dma_alloc_coherent /* coherent mem. is cheap */ +/* coherent mem. is cheap */ +static inline void * +dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle, + gfp_t flag) +{ + return dma_alloc_coherent(dev, size, dma_handle, flag); +} #define dma_free_coherent platform_dma_free_coherent -#define dma_free_noncoherent platform_dma_free_coherent +static inline void +dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr, + dma_addr_t dma_handle) +{ + dma_free_coherent(dev, size, cpu_addr, dma_handle); +} #define dma_map_single platform_dma_map_single #define dma_map_sg platform_dma_map_sg #define dma_unmap_single platform_dma_unmap_single