diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-mips/compat.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-mips/compat.h')
| -rw-r--r-- | include/asm-mips/compat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/compat.h b/include/asm-mips/compat.h index 35d2604fe69c..0012bd804d2d 100644 --- a/include/asm-mips/compat.h +++ b/include/asm-mips/compat.h | |||
| @@ -128,17 +128,17 @@ typedef u32 compat_sigset_word; | |||
| 128 | */ | 128 | */ |
| 129 | typedef u32 compat_uptr_t; | 129 | typedef u32 compat_uptr_t; |
| 130 | 130 | ||
| 131 | static inline void *compat_ptr(compat_uptr_t uptr) | 131 | static inline void __user *compat_ptr(compat_uptr_t uptr) |
| 132 | { | 132 | { |
| 133 | return (void *)(long)uptr; | 133 | return (void __user *)(long)uptr; |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | static inline void *compat_alloc_user_space(long len) | 136 | static inline void __user *compat_alloc_user_space(long len) |
| 137 | { | 137 | { |
| 138 | struct pt_regs *regs = (struct pt_regs *) | 138 | struct pt_regs *regs = (struct pt_regs *) |
| 139 | ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1; | 139 | ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1; |
| 140 | 140 | ||
| 141 | return (void *) (regs->regs[29] - len); | 141 | return (void __user *) (regs->regs[29] - len); |
| 142 | } | 142 | } |
| 143 | #if defined (__MIPSEL__) | 143 | #if defined (__MIPSEL__) |
| 144 | #define __COMPAT_ENDIAN_SWAP__ 1 | 144 | #define __COMPAT_ENDIAN_SWAP__ 1 |