summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds2007-08-18 18:42:43 +0200
committerLinus Torvalds2007-08-18 18:42:43 +0200
commit203f3394397642f2f9d9ee760f03420459b7a8ef (patch)
tree75fdd447e2cebd0919988f42a2f34c5fbe9923d8 /include
parentMerge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 (diff)
parentsh: remove extraneous ; on scif_sercon_putc wait loop (diff)
downloadkernel-qcow2-linux-203f3394397642f2f9d9ee760f03420459b7a8ef.tar.gz
kernel-qcow2-linux-203f3394397642f2f9d9ee760f03420459b7a8ef.tar.xz
kernel-qcow2-linux-203f3394397642f2f9d9ee760f03420459b7a8ef.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23: sh: remove extraneous ; on scif_sercon_putc wait loop sh: Add missing dma_sync_single_range_for_*(). sh: panic on machvec section misalignment. sh: Fix PTRACE_PEEKTEXT/PEEKDATA fallout from generic_ptrace_peekdata().
Diffstat (limited to 'include')
-rw-r--r--include/asm-sh/dma-mapping.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index 6f492ac3fa13..84fefdaa01a5 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -160,6 +160,25 @@ static inline void dma_sync_single_for_device(struct device *dev,
dma_sync_single(dev, dma_handle, size, dir);
}
+static inline void dma_sync_single_range_for_cpu(struct device *dev,
+ dma_addr_t dma_handle,
+ unsigned long offset,
+ size_t size,
+ enum dma_data_direction direction)
+{
+ dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);
+}
+
+static inline void dma_sync_single_range_for_device(struct device *dev,
+ dma_addr_t dma_handle,
+ unsigned long offset,
+ size_t size,
+ enum dma_data_direction direction)
+{
+ dma_sync_single_for_device(dev, dma_handle+offset, size, direction);
+}
+
+
static inline void dma_sync_sg_for_cpu(struct device *dev,
struct scatterlist *sg, int nelems,
enum dma_data_direction dir)