Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / include / asm-x86_64 / compat.h

diff --git a/include/asm-x86_64/compat.h b/include/asm-x86_64/compat.h
index c1e04aa..c4f5209 100644 (file)
--- a/include/asm-x86_64/compat.h
+++ b/include/asm-x86_64/compat.h
@@ -186,15 +186,15 @@ struct compat_shmid64_ds {
  */
 typedef        u32             compat_uptr_t;
 
-static inline void __user *compat_ptr(compat_uptr_t uptr)
+static inline void *compat_ptr(compat_uptr_t uptr)
 {
-       return (void __user *)(unsigned long)uptr;
+       return (void *)(unsigned long)uptr;
 }
 
-static __inline__ void __user *compat_alloc_user_space(long len)
+static __inline__ void *compat_alloc_user_space(long len)
 {
        struct pt_regs *regs = (void *)current->thread.rsp0 - sizeof(struct pt_regs); 
-       return (void __user *)regs->rsp - len; 
+       return (void *)regs->rsp - len; 
 }
 
 #endif /* _ASM_X86_64_COMPAT_H */