From 59a167b0ce528fbb15c0e1734c0a5459f54a5cd0 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 29 May 2012 07:33:59 +0200
Subject: [PATCH] --- yaml --- r: 309602 b: refs/heads/master c:
 491af9903b858ee7c36735dc31708fe4074ce56f h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/s390/include/asm/uaccess.h | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 137d5a6740ab..71d90cd6e467 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e30db9522837e2a5d30ce1e66afb0a7ee0ff350
+refs/heads/master: 491af9903b858ee7c36735dc31708fe4074ce56f
diff --git a/trunk/arch/s390/include/asm/uaccess.h b/trunk/arch/s390/include/asm/uaccess.h
index 8e83da66df0d..1f3a79bcd262 100644
--- a/trunk/arch/s390/include/asm/uaccess.h
+++ b/trunk/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)