diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-02-01 06:55:59 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-02-08 01:04:23 -0500 |
| commit | 793af244090ccb5f99091c5a999ce97e4d017834 (patch) | |
| tree | 070649219443dde1e484718114515e425cb26628 | |
| parent | 6b2b4e5a26fe3795b1c6711cee0eae057844491d (diff) | |
[PATCH] s390 misc __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 4 | ||||
| -rw-r--r-- | arch/s390/kernel/traps.c | 2 | ||||
| -rw-r--r-- | include/asm-s390/uaccess.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 6a63553493c..e351780bb66 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -122,8 +122,8 @@ out: #ifndef CONFIG_64BIT struct sel_arg_struct { unsigned long n; - fd_set *inp, *outp, *exp; - struct timeval *tvp; + fd_set __user *inp, *outp, *exp; + struct timeval __user *tvp; }; asmlinkage long old_select(struct sel_arg_struct __user *arg) diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index 5d21e9e6e7b..a46793beedd 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c @@ -486,7 +486,7 @@ asmlinkage void illegal_op(struct pt_regs * regs, long interruption_code) info.si_signo = signal; info.si_errno = 0; info.si_code = ILL_ILLOPC; - info.si_addr = (void *) location; + info.si_addr = (void __user *) location; do_trap(interruption_code, signal, "illegal operation", regs, &info); } diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h index be104f21c70..e2c73b45de4 100644 --- a/include/asm-s390/uaccess.h +++ b/include/asm-s390/uaccess.h @@ -61,7 +61,7 @@ #define segment_eq(a,b) ((a).ar4 == (b).ar4) -static inline int __access_ok(const void *addr, unsigned long size) +static inline int __access_ok(const void __user *addr, unsigned long size) { return 1; } |