From 810d62e91bd1bafd18fd6231c3931be132d4ba1c Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 26 May 2011 09:48:25 +0200 Subject: [PATCH] --- yaml --- r: 252215 b: refs/heads/master c: 7683f7444875c822f48f03a9f9c8b1b1e98b2ef0 h: refs/heads/master i: 252213: 3658319a749ed188820feac866ef2126974ffbd0 252211: fb6bd61e8ed38c4724a9a57f69e8483519cbe9f8 252207: 58d3435a308193d882b681aca46ae2c178cebfdc v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/uaccess.h | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4bdfd3726ab6..82a28d083b57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d +refs/heads/master: 7683f7444875c822f48f03a9f9c8b1b1e98b2ef0 diff --git a/trunk/arch/s390/include/asm/uaccess.h b/trunk/arch/s390/include/asm/uaccess.h index 2d9ea11f919a..2b23885e81e9 100644 --- a/trunk/arch/s390/include/asm/uaccess.h +++ b/trunk/arch/s390/include/asm/uaccess.h @@ -49,12 +49,13 @@ #define segment_eq(a,b) ((a).ar4 == (b).ar4) +#define __access_ok(addr, size) \ +({ \ + __chk_user_ptr(addr); \ + 1; \ +}) -static inline int __access_ok(const void __user *addr, unsigned long size) -{ - return 1; -} -#define access_ok(type,addr,size) __access_ok(addr,size) +#define access_ok(type, addr, size) __access_ok(addr, size) /* * The exception table consists of pairs of addresses: the first is the