From 654e4d72482fa9d4dcbef01f5232721a1d5cb8d3 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat, 14 Apr 2012 18:03:10 +0200
Subject: [PATCH] --- yaml --- r: 307085 b: refs/heads/master c:
 9923777dff4543050fdf938cf6b19f6d4376b7c5 h: refs/heads/master i:   307083:
 1832658f6105c4b99ad3a0c01efbae16b7412894 v: v3

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

diff --git a/[refs] b/[refs]
index abedbadbac3f..ec202dc50421 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8353e6c632aeaea1470a286b83e68ca233073068
+refs/heads/master: 9923777dff4543050fdf938cf6b19f6d4376b7c5
diff --git a/trunk/include/linux/pagemap.h b/trunk/include/linux/pagemap.h
index c93a9a9bcd35..efa26b4da8d2 100644
--- a/trunk/include/linux/pagemap.h
+++ b/trunk/include/linux/pagemap.h
@@ -461,7 +461,7 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
 static inline int fault_in_multipages_writeable(char __user *uaddr, int size)
 {
 	int ret;
-	const char __user *end = uaddr + size - 1;
+	char __user *end = uaddr + size - 1;
 
 	if (unlikely(size == 0))
 		return 0;