diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /ipc/compat.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'ipc/compat.c')
| -rw-r--r-- | ipc/compat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipc/compat.c b/ipc/compat.c index 3881d564c668..1fe95f6659dd 100644 --- a/ipc/compat.c +++ b/ipc/compat.c | |||
| @@ -42,10 +42,10 @@ struct compat_msgbuf { | |||
| 42 | 42 | ||
| 43 | struct compat_ipc_perm { | 43 | struct compat_ipc_perm { |
| 44 | key_t key; | 44 | key_t key; |
| 45 | compat_uid_t uid; | 45 | __compat_uid_t uid; |
| 46 | compat_gid_t gid; | 46 | __compat_gid_t gid; |
| 47 | compat_uid_t cuid; | 47 | __compat_uid_t cuid; |
| 48 | compat_gid_t cgid; | 48 | __compat_gid_t cgid; |
| 49 | compat_mode_t mode; | 49 | compat_mode_t mode; |
| 50 | unsigned short seq; | 50 | unsigned short seq; |
| 51 | }; | 51 | }; |
| @@ -174,8 +174,8 @@ static inline int __put_compat_ipc_perm(struct ipc64_perm *p, | |||
| 174 | struct compat_ipc_perm __user *up) | 174 | struct compat_ipc_perm __user *up) |
| 175 | { | 175 | { |
| 176 | int err; | 176 | int err; |
| 177 | compat_uid_t u; | 177 | __compat_uid_t u; |
| 178 | compat_gid_t g; | 178 | __compat_gid_t g; |
| 179 | 179 | ||
| 180 | err = __put_user(p->key, &up->key); | 180 | err = __put_user(p->key, &up->key); |
| 181 | SET_UID(u, p->uid); | 181 | SET_UID(u, p->uid); |