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 /arch/mips/kernel/linux32.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 4613219dd73e..ece4564919d8 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -546,20 +546,20 @@ struct msgbuf32 { s32 mtype; char mtext[1]; }; | |||
| 546 | struct ipc_perm32 | 546 | struct ipc_perm32 |
| 547 | { | 547 | { |
| 548 | key_t key; | 548 | key_t key; |
| 549 | compat_uid_t uid; | 549 | __compat_uid_t uid; |
| 550 | compat_gid_t gid; | 550 | __compat_gid_t gid; |
| 551 | compat_uid_t cuid; | 551 | __compat_uid_t cuid; |
| 552 | compat_gid_t cgid; | 552 | __compat_gid_t cgid; |
| 553 | compat_mode_t mode; | 553 | compat_mode_t mode; |
| 554 | unsigned short seq; | 554 | unsigned short seq; |
| 555 | }; | 555 | }; |
| 556 | 556 | ||
| 557 | struct ipc64_perm32 { | 557 | struct ipc64_perm32 { |
| 558 | key_t key; | 558 | key_t key; |
| 559 | compat_uid_t uid; | 559 | __compat_uid_t uid; |
| 560 | compat_gid_t gid; | 560 | __compat_gid_t gid; |
| 561 | compat_uid_t cuid; | 561 | __compat_uid_t cuid; |
| 562 | compat_gid_t cgid; | 562 | __compat_gid_t cgid; |
| 563 | compat_mode_t mode; | 563 | compat_mode_t mode; |
| 564 | unsigned short seq; | 564 | unsigned short seq; |
| 565 | unsigned short __pad1; | 565 | unsigned short __pad1; |