From c01102b5bea410560fc51973814ede7ac2f29a47 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 12 Sep 2008 19:42:34 +0900 Subject: [PATCH] --- yaml --- r: 112587 b: refs/heads/master c: 589fc9a6e2102b498978f6350581ec7fa5aeb032 h: refs/heads/master i: 112585: f52082ab12a6dae138c4d479274b2afd1c39e430 112583: db7865035922e17aae1276122badf2f875291c52 v: v3 --- [refs] | 2 +- trunk/include/linux/dma-mapping.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2bbd1dd74125..22a21d1a14e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eecfffc154ffbfe70686a9905c090b488778c28e +refs/heads/master: 589fc9a6e2102b498978f6350581ec7fa5aeb032 diff --git a/trunk/include/linux/dma-mapping.h b/trunk/include/linux/dma-mapping.h index 6ed50c1642f1..0dba7433af18 100644 --- a/trunk/include/linux/dma-mapping.h +++ b/trunk/include/linux/dma-mapping.h @@ -63,6 +63,13 @@ static inline int is_buffer_dma_capable(u64 mask, dma_addr_t addr, size_t size) #define dma_sync_single dma_sync_single_for_cpu #define dma_sync_sg dma_sync_sg_for_cpu +static inline u64 dma_get_mask(struct device *dev) +{ + if (dev->dma_mask && *dev->dma_mask) + return *dev->dma_mask; + return DMA_32BIT_MASK; +} + extern u64 dma_get_required_mask(struct device *dev); static inline unsigned int dma_get_max_seg_size(struct device *dev)