aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-08-09 20:19:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:44:58 -0400
commit627295e492638936e76f3d8fcb1e0a3367b88341 (patch)
tree94ef884e0e248fef8de4b5605a67812191cd3762
parent67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271 (diff)
gcc-4.6: pagemap: avoid unused-but-set variable
Avoid quite a lot of warnings in header files in a gcc 4.6 -Wall builds Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/pagemap.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 3c62ed408492..78a702ce4fcb 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -423,8 +423,10 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
423 const char __user *end = uaddr + size - 1; 423 const char __user *end = uaddr + size - 1;
424 424
425 if (((unsigned long)uaddr & PAGE_MASK) != 425 if (((unsigned long)uaddr & PAGE_MASK) !=
426 ((unsigned long)end & PAGE_MASK)) 426 ((unsigned long)end & PAGE_MASK)) {
427 ret = __get_user(c, end); 427 ret = __get_user(c, end);
428 (void)c;
429 }
428 } 430 }
429 return ret; 431 return ret;
430} 432}