aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2016-09-26 09:57:33 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-25 18:16:44 -0700
commit90b75db6498a19da96dac4b55c909ff3721f3045 (patch)
treefa40265db710d5f6b599eeeeac14f5df7ec37842
parent38e088546522e1e86d2b8f401a1354ad3a9b3303 (diff)
downloadkernel_i9300_mainline-90b75db6498a19da96dac4b55c909ff3721f3045.zip
kernel_i9300_mainline-90b75db6498a19da96dac4b55c909ff3721f3045.tar.gz
kernel_i9300_mainline-90b75db6498a19da96dac4b55c909ff3721f3045.tar.bz2
fault_in_multipages_readable() throws set-but-unused error
When building XFS with -Werror, it now fails with: include/linux/pagemap.h: In function 'fault_in_multipages_readable': include/linux/pagemap.h:602:16: error: variable 'c' set but not used [-Werror=unused-but-set-variable] volatile char c; ^ This is a regression caused by commit e23d4159b109 ("fix fault_in_multipages_...() on architectures with no-op access_ok()"). Fix it by re-adding the "(void)c" trick taht was previously used to make the compiler think the variable is used. Signed-off-by: Dave Chinner <dchinner@redhat.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/pagemap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 7e3d537..01e8443 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -620,6 +620,7 @@ static inline int fault_in_multipages_readable(const char __user *uaddr,
return __get_user(c, end);
}
+ (void)c;
return 0;
}