From e0e416e2c82e6f354c9460c1393be4ccff550650 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 29 Mar 2008 03:09:38 +0000
Subject: [PATCH] --- yaml --- r: 87932 b: refs/heads/master c:
 b2ddb9019ea13fb7b62d8e45adcc468376af0de7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/dmaengine.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cff68e370175..f31e90aaa87d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b210adcb08c7966feeb8574cd90514f1e797ae9
+refs/heads/master: b2ddb9019ea13fb7b62d8e45adcc468376af0de7
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index 261e43a4c873..34d440698293 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -423,7 +423,7 @@ void dma_async_device_unregister(struct dma_device *device);
 /* --- Helper iov-locking functions --- */
 
 struct dma_page_list {
-	char *base_address;
+	char __user *base_address;
 	int nr_pages;
 	struct page **pages;
 };