---

yaml --- r: 112587 b: refs/heads/master c: 589fc9a h: refs/heads/master i: 112585: f52082a 112583: db78650 v: v3
git-mirror · Sep 14, 2008 · c01102b · c01102b
1 parent 7d63d0c
commit c01102b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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)