diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-08-23 22:48:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 18:43:46 -0700 |
| commit | 17566c3c5ed3ea8f941a135cf960387214c4f6ac (patch) | |
| tree | 6c00d5dbe93288439c54c4635326c13723588943 /include/asm-s390 | |
| parent | 8032230694ec56c168a1404c67a54d281536cbed (diff) | |
| download | op-kernel-dev-17566c3c5ed3ea8f941a135cf960387214c4f6ac.zip op-kernel-dev-17566c3c5ed3ea8f941a135cf960387214c4f6ac.tar.gz | |
[PATCH] s390 __CHECKER__ ifdefs
remove the bogus games with explicit ifdefs on __CHECKER__
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/uaccess.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h index a7f43a2..3e3bfe6 100644 --- a/include/asm-s390/uaccess.h +++ b/include/asm-s390/uaccess.h @@ -149,11 +149,11 @@ struct exception_table_entry }) #endif -#ifndef __CHECKER__ #define __put_user(x, ptr) \ ({ \ __typeof__(*(ptr)) __x = (x); \ int __pu_err; \ + __chk_user_ptr(ptr); \ switch (sizeof (*(ptr))) { \ case 1: \ case 2: \ @@ -167,14 +167,6 @@ struct exception_table_entry } \ __pu_err; \ }) -#else -#define __put_user(x, ptr) \ -({ \ - void __user *p; \ - p = (ptr); \ - 0; \ -}) -#endif #define put_user(x, ptr) \ ({ \ @@ -213,11 +205,11 @@ extern int __put_user_bad(void) __attribute__((noreturn)); }) #endif -#ifndef __CHECKER__ #define __get_user(x, ptr) \ ({ \ __typeof__(*(ptr)) __x; \ int __gu_err; \ + __chk_user_ptr(ptr); \ switch (sizeof(*(ptr))) { \ case 1: \ case 2: \ @@ -232,15 +224,6 @@ extern int __put_user_bad(void) __attribute__((noreturn)); (x) = __x; \ __gu_err; \ }) -#else -#define __get_user(x, ptr) \ -({ \ - void __user *p; \ - p = (ptr); \ - 0; \ -}) -#endif - #define get_user(x, ptr) \ ({ \ |
