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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-parisc
/
compat.h
diff --git
a/include/asm-parisc/compat.h
b/include/asm-parisc/compat.h
index
3edb5db
..
289624d
100644
(file)
--- a/
include/asm-parisc/compat.h
+++ b/
include/asm-parisc/compat.h
@@
-13,8
+13,10
@@
typedef s32 compat_ssize_t;
typedef s32 compat_time_t;
typedef s32 compat_clock_t;
typedef s32 compat_pid_t;
typedef s32 compat_time_t;
typedef s32 compat_clock_t;
typedef s32 compat_pid_t;
-typedef u32 compat_uid_t;
-typedef u32 compat_gid_t;
+typedef u32 __compat_uid_t;
+typedef u32 __compat_gid_t;
+typedef u32 __compat_uid32_t;
+typedef u32 __compat_gid32_t;
typedef u16 compat_mode_t;
typedef u32 compat_ino_t;
typedef u32 compat_dev_t;
typedef u16 compat_mode_t;
typedef u32 compat_ino_t;
typedef u32 compat_dev_t;
@@
-24,7
+26,7
@@
typedef u16 compat_nlink_t;
typedef u16 compat_ipc_pid_t;
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
typedef u16 compat_ipc_pid_t;
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
-typedef
u
32 compat_timer_t;
+typedef
s
32 compat_timer_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
@@
-67,8
+69,8
@@
struct compat_stat {
compat_dev_t st_realdev;
u16 st_basemode;
u16 st_spareshort;
compat_dev_t st_realdev;
u16 st_basemode;
u16 st_spareshort;
-
compat_uid_t
st_uid;
-
compat_gid_t
st_gid;
+
__compat_uid32_t
st_uid;
+
__compat_gid32_t
st_gid;
u32 st_spare4[3];
};
u32 st_spare4[3];
};
@@
-131,15
+133,20
@@
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 compat_uptr_t ptr_to_compat(void __user *uptr)
+{
+ return (u32)(unsigned long)uptr;
+}
+
+static __inline__ void __user *compat_alloc_user_space(long len)
{
struct pt_regs *regs = ¤t->thread.regs;
{
struct pt_regs *regs = ¤t->thread.regs;
- return (void *)regs->gr[30];
+ return (void
__user
*)regs->gr[30];
}
#endif /* _ASM_PARISC_COMPAT_H */
}
#endif /* _ASM_PARISC_COMPAT_H */