summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-05-29 07:33:59 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-05-30 10:01:11 +0200
commit491af9903b858ee7c36735dc31708fe4074ce56f (patch)
tree3617b5b496f610bffe9142ba07f6395bfe513497 /arch/s390
parent2e30db9522837e2a5d30ce1e66afb0a7ee0ff350 (diff)
downloadop-kernel-dev-491af9903b858ee7c36735dc31708fe4074ce56f.zip
op-kernel-dev-491af9903b858ee7c36735dc31708fe4074ce56f.tar.gz
s390/uaccess: fix access_ok compile warnings
On s390 access_ok is a macro which discards all parameters and always returns 1. This can result in compile warnings which warn about unused variables like this: fs/read_write.c: In function 'rw_copy_check_uvector': fs/read_write.c:684:16: warning: unused variable 'buf' [-Wunused-variable] Fix this by adding a __range_ok() function which consumes all parameters but still always returns 1. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/uaccess.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 8e83da6..1f3a79b 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -50,10 +50,15 @@
#define segment_eq(a,b) ((a).ar4 == (b).ar4)
-#define __access_ok(addr, size) \
-({ \
- __chk_user_ptr(addr); \
- 1; \
+static inline int __range_ok(unsigned long addr, unsigned long size)
+{
+ return 1;
+}
+
+#define __access_ok(addr, size) \
+({ \
+ __chk_user_ptr(addr); \
+ __range_ok((unsigned long)(addr), (size)); \
})
#define access_ok(type, addr, size) __access_ok(addr, size)
OpenPOWER on IntegriCloud