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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-s390
/
compat.h
diff --git
a/include/asm-s390/compat.h
b/include/asm-s390/compat.h
index
81b21b8
..
356a0b1
100644
(file)
--- a/
include/asm-s390/compat.h
+++ b/
include/asm-s390/compat.h
@@
-13,10
+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 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;
@@
-51,8
+51,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;
@@
-123,27
+123,32
@@
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 & 0x7fffffffUL);
+ return (void
__user
*)(unsigned long)(uptr & 0x7fffffffUL);
}
}
-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)
{
unsigned long stack;
stack = KSTK_ESP(current);
if (test_thread_flag(TIF_31BIT))
stack &= 0x7fffffffUL;
{
unsigned long stack;
stack = KSTK_ESP(current);
if (test_thread_flag(TIF_31BIT))
stack &= 0x7fffffffUL;
- return (void *) (stack - len);
+ return (void
__user
*) (stack - len);
}
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;
compat_mode_t mode;
unsigned short __pad1;
unsigned short seq;
compat_mode_t mode;
unsigned short __pad1;
unsigned short seq;