git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
include
/
asm-sparc64
/
compat.h
diff --git
a/include/asm-sparc64/compat.h
b/include/asm-sparc64/compat.h
index
02af913
..
874b136
100644
(file)
--- a/
include/asm-sparc64/compat.h
+++ b/
include/asm-sparc64/compat.h
@@
-116,12
+116,12
@@
typedef u32 compat_sigset_word;
*/
typedef u32 compat_uptr_t;
*/
typedef u32 compat_uptr_t;
-static inline void *compat_ptr(compat_uptr_t uptr)
+static inline void
__user
*compat_ptr(compat_uptr_t uptr)
{
{
- return (void *)(unsigned long)uptr;
+ return (void
__user
*)(unsigned long)uptr;
}
}
-static __inline__ void *compat_alloc_user_space(long len)
+static __inline__ void
__user
*compat_alloc_user_space(long len)
{
struct pt_regs *regs = current_thread_info()->kregs;
unsigned long usp = regs->u_regs[UREG_I6];
{
struct pt_regs *regs = current_thread_info()->kregs;
unsigned long usp = regs->u_regs[UREG_I6];
@@
-129,7
+129,7
@@
static __inline__ void *compat_alloc_user_space(long len)
if (!(test_thread_flag(TIF_32BIT)))
usp += STACK_BIAS;
if (!(test_thread_flag(TIF_32BIT)))
usp += STACK_BIAS;
- return (void *) (usp - len);
+ return (void
__user
*) (usp - len);
}
#endif /* _ASM_SPARC64_COMPAT_H */
}
#endif /* _ASM_SPARC64_COMPAT_H */