From ea76ec19e7d6369b34b5f6adf10183399b78141d Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 9 Aug 2010 17:19:02 -0700
Subject: [PATCH] --- yaml --- r: 207227 b: refs/heads/master c:
 627295e492638936e76f3d8fcb1e0a3367b88341 h: refs/heads/master i:   207225:
 3b783ac151cd2cccd898b1717cc22d6ad69dc96a   207223:
 f56ed7325192cb6da6a3339a19ad14b21e18720c v: v3

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

diff --git a/[refs] b/[refs]
index ef16c8bb7582..062545ea98f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271
+refs/heads/master: 627295e492638936e76f3d8fcb1e0a3367b88341
diff --git a/trunk/include/linux/pagemap.h b/trunk/include/linux/pagemap.h
index 3c62ed408492..78a702ce4fcb 100644
--- a/trunk/include/linux/pagemap.h
+++ b/trunk/include/linux/pagemap.h
@@ -423,8 +423,10 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
 		const char __user *end = uaddr + size - 1;
 
 		if (((unsigned long)uaddr & PAGE_MASK) !=
-				((unsigned long)end & PAGE_MASK))
+				((unsigned long)end & PAGE_MASK)) {
 		 	ret = __get_user(c, end);
+			(void)c;
+		}
 	}
 	return ret;
 }