diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /include/asm-s390/uaccess.h | |
| parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
| parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
Merge branch 'viro'
Diffstat (limited to 'include/asm-s390/uaccess.h')
| -rw-r--r-- | include/asm-s390/uaccess.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h index be104f21c70a..0b7c0ca4c3d7 100644 --- a/include/asm-s390/uaccess.h +++ b/include/asm-s390/uaccess.h | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | #define segment_eq(a,b) ((a).ar4 == (b).ar4) | 61 | #define segment_eq(a,b) ((a).ar4 == (b).ar4) |
| 62 | 62 | ||
| 63 | 63 | ||
| 64 | static inline int __access_ok(const void *addr, unsigned long size) | 64 | static inline int __access_ok(const void __user *addr, unsigned long size) |
| 65 | { | 65 | { |
| 66 | return 1; | 66 | return 1; |
| 67 | } | 67 | } |
| @@ -208,25 +208,25 @@ extern int __put_user_bad(void) __attribute__((noreturn)); | |||
| 208 | case 1: { \ | 208 | case 1: { \ |
| 209 | unsigned char __x; \ | 209 | unsigned char __x; \ |
| 210 | __get_user_asm(__x, ptr, __gu_err); \ | 210 | __get_user_asm(__x, ptr, __gu_err); \ |
| 211 | (x) = *(__typeof__(*(ptr)) *) &__x; \ | 211 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 212 | break; \ | 212 | break; \ |
| 213 | }; \ | 213 | }; \ |
| 214 | case 2: { \ | 214 | case 2: { \ |
| 215 | unsigned short __x; \ | 215 | unsigned short __x; \ |
| 216 | __get_user_asm(__x, ptr, __gu_err); \ | 216 | __get_user_asm(__x, ptr, __gu_err); \ |
| 217 | (x) = *(__typeof__(*(ptr)) *) &__x; \ | 217 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 218 | break; \ | 218 | break; \ |
| 219 | }; \ | 219 | }; \ |
| 220 | case 4: { \ | 220 | case 4: { \ |
| 221 | unsigned int __x; \ | 221 | unsigned int __x; \ |
| 222 | __get_user_asm(__x, ptr, __gu_err); \ | 222 | __get_user_asm(__x, ptr, __gu_err); \ |
| 223 | (x) = *(__typeof__(*(ptr)) *) &__x; \ | 223 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 224 | break; \ | 224 | break; \ |
| 225 | }; \ | 225 | }; \ |
| 226 | case 8: { \ | 226 | case 8: { \ |
| 227 | unsigned long long __x; \ | 227 | unsigned long long __x; \ |
| 228 | __get_user_asm(__x, ptr, __gu_err); \ | 228 | __get_user_asm(__x, ptr, __gu_err); \ |
| 229 | (x) = *(__typeof__(*(ptr)) *) &__x; \ | 229 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 230 | break; \ | 230 | break; \ |
| 231 | }; \ | 231 | }; \ |
| 232 | default: \ | 232 | default: \ |