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-ia64
/
compat.h
diff --git
a/include/asm-ia64/compat.h
b/include/asm-ia64/compat.h
index
cc0ff0a
..
40d01d8
100644
(file)
--- a/
include/asm-ia64/compat.h
+++ b/
include/asm-ia64/compat.h
@@
-13,10
+13,10
@@
typedef s32 compat_time_t;
typedef s32 compat_clock_t;
typedef s32 compat_key_t;
typedef s32 compat_pid_t;
typedef s32 compat_clock_t;
typedef s32 compat_key_t;
typedef s32 compat_pid_t;
-typedef u16 compat_uid_t;
-typedef u16 compat_gid_t;
-typedef u32 compat_uid32_t;
-typedef u32 compat_gid32_t;
+typedef u16
__
compat_uid_t;
+typedef u16
__
compat_gid_t;
+typedef u32
__
compat_uid32_t;
+typedef u32
__
compat_gid32_t;
typedef u16 compat_mode_t;
typedef u32 compat_ino_t;
typedef u16 compat_dev_t;
typedef u16 compat_mode_t;
typedef u32 compat_ino_t;
typedef u16 compat_dev_t;
@@
-27,6
+27,7
@@
typedef u16 compat_ipc_pid_t;
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
typedef __kernel_fsid_t compat_fsid_t;
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
typedef __kernel_fsid_t compat_fsid_t;
+typedef s32 compat_timer_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
@@
-49,8
+50,8
@@
struct compat_stat {
compat_ino_t st_ino;
compat_mode_t st_mode;
compat_nlink_t st_nlink;
compat_ino_t st_ino;
compat_mode_t st_mode;
compat_nlink_t st_nlink;
-
compat_uid_t
st_uid;
-
compat_gid_t
st_gid;
+
__compat_uid_t
st_uid;
+
__compat_gid_t
st_gid;
compat_dev_t st_rdev;
u16 __pad2;
u32 st_size;
compat_dev_t st_rdev;
u16 __pad2;
u32 st_size;
@@
-119,10
+120,10
@@
typedef u32 compat_sigset_word;
struct compat_ipc64_perm {
compat_key_t key;
struct compat_ipc64_perm {
compat_key_t key;
- compat_uid32_t uid;
- compat_gid32_t gid;
- compat_uid32_t cuid;
- compat_gid32_t cgid;
+
__
compat_uid32_t uid;
+
__
compat_gid32_t gid;
+
__
compat_uid32_t cuid;
+
__
compat_gid32_t cgid;
unsigned short mode;
unsigned short __pad1;
unsigned short seq;
unsigned short mode;
unsigned short __pad1;
unsigned short seq;
@@
-188,10
+189,16
@@
compat_ptr (compat_uptr_t uptr)
return (void __user *) (unsigned long) uptr;
}
return (void __user *) (unsigned long) uptr;
}
+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)
{
static __inline__ void __user *
compat_alloc_user_space (long len)
{
- struct pt_regs *regs =
ia64_task
_regs(current);
+ struct pt_regs *regs =
task_pt
_regs(current);
return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
}
return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
}