From cf0aa809385e7adf9b6f3e11ddc0fdf5358654bf Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Sun, 22 Aug 2010 19:08:57 +0800
Subject: [PATCH] --- yaml --- r: 215774 b: refs/heads/master c:
 45888a0c6edc305495b6bd72a30e66bc40b324c6 h: refs/heads/master v: v3

---
 [refs]          |  2 +-
 trunk/mm/util.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 28cd06626045..279f912fcb43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f392eb2546170e539668a5ab8df6c1254d15a201
+refs/heads/master: 45888a0c6edc305495b6bd72a30e66bc40b324c6
diff --git a/trunk/mm/util.c b/trunk/mm/util.c
index 4735ea481816..73dac81e9f78 100644
--- a/trunk/mm/util.c
+++ b/trunk/mm/util.c
@@ -245,6 +245,19 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 }
 #endif
 
+/*
+ * Like get_user_pages_fast() except its IRQ-safe in that it won't fall
+ * back to the regular GUP.
+ * If the architecture not support this fucntion, simply return with no
+ * page pinned
+ */
+int __attribute__((weak)) __get_user_pages_fast(unsigned long start,
+				 int nr_pages, int write, struct page **pages)
+{
+	return 0;
+}
+EXPORT_SYMBOL_GPL(__get_user_pages_fast);
+
 /**
  * get_user_pages_fast() - pin user pages in memory
  * @start:	starting user address