diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/asm-s390/uaccess.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'include/asm-s390/uaccess.h')
| -rw-r--r-- | include/asm-s390/uaccess.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h index 3e3bfe6a8fa8..38a5cf8ab9e3 100644 --- a/include/asm-s390/uaccess.h +++ b/include/asm-s390/uaccess.h | |||
| @@ -65,13 +65,6 @@ | |||
| 65 | 65 | ||
| 66 | #define access_ok(type,addr,size) __access_ok(addr,size) | 66 | #define access_ok(type,addr,size) __access_ok(addr,size) |
| 67 | 67 | ||
| 68 | /* this function will go away soon - use access_ok() instead */ | ||
| 69 | extern inline int __deprecated verify_area(int type, const void __user *addr, | ||
| 70 | unsigned long size) | ||
| 71 | { | ||
| 72 | return access_ok(type, addr, size) ? 0 : -EFAULT; | ||
| 73 | } | ||
| 74 | |||
| 75 | /* | 68 | /* |
| 76 | * The exception table consists of pairs of addresses: the first is the | 69 | * The exception table consists of pairs of addresses: the first is the |
| 77 | * address of an instruction that is allowed to fault, and the second is | 70 | * address of an instruction that is allowed to fault, and the second is |