From 746dacafba13a73482a7ecfa462d9e23965adc8b Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <tomof@acm.org>
Date: Mon, 4 Feb 2008 22:28:13 -0800
Subject: [PATCH] --- yaml --- r: 83025 b: refs/heads/master c:
 d22a6966b8029913fac37d078ab2403898d94c63 h: refs/heads/master i:   83023:
 d0807f51a201c1ac591cf89169010f82a6982bd9 v: v3

---
 [refs]                            |  2 +-
 trunk/include/linux/dma-mapping.h | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08e646e42142..2a9bebd39b6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67ec11cf968241c9ae907f8817b6ac74d4dd71d7
+refs/heads/master: d22a6966b8029913fac37d078ab2403898d94c63
diff --git a/trunk/include/linux/dma-mapping.h b/trunk/include/linux/dma-mapping.h
index df3a3610caf0..332030709623 100644
--- a/trunk/include/linux/dma-mapping.h
+++ b/trunk/include/linux/dma-mapping.h
@@ -75,6 +75,21 @@ static inline unsigned int dma_set_max_seg_size(struct device *dev,
 		return -EIO;
 }
 
+static inline unsigned long dma_get_seg_boundary(struct device *dev)
+{
+	return dev->dma_parms ?
+		dev->dma_parms->segment_boundary_mask : 0xffffffff;
+}
+
+static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
+{
+	if (dev->dma_parms) {
+		dev->dma_parms->segment_boundary_mask = mask;
+		return 0;
+	} else
+		return -EIO;
+}
+
 /* flags for the coherent memory api */
 #define	DMA_MEMORY_MAP			0x01
 #define DMA_MEMORY_IO			0x02