X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=include%2Fasm-ia64%2Fcompat.h;h=cc0ff0a4bdd07d33b93966b9e9eff89bceeda725;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=60ef0bab334b31ff8710c84aff5ded0922ef72ff;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h index 60ef0bab3..cc0ff0a4b 100644 --- a/include/asm-ia64/compat.h +++ b/include/asm-ia64/compat.h @@ -182,17 +182,17 @@ struct compat_shmid64_ds { */ typedef u32 compat_uptr_t; -static inline void * +static inline void __user * compat_ptr (compat_uptr_t uptr) { - return (void *) (unsigned long) uptr; + return (void __user *) (unsigned long) uptr; } -static __inline__ void * +static __inline__ void __user * compat_alloc_user_space (long len) { struct pt_regs *regs = ia64_task_regs(current); - return (void *) (((regs->r12 & 0xffffffff) & -16) - len); + return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len); } #endif /* _ASM_IA64_COMPAT_H */