diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 18:16:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:19 -0400 |
commit | 202e5979af4d91c7ca05892641131dee22653259 (patch) | |
tree | ba8443571add62bc93d29c1f6a3575381cccd167 /arch/mips | |
parent | 8dbfc5cfdcac04d656f6f6789eb8fcdcc3d2dfda (diff) |
[PATCH] compat: be more consistent about [ug]id_t
When I first wrote the compat layer patches, I was somewhat cavalier about
the definition of compat_uid_t and compat_gid_t (or maybe I just
misunderstood :-)). This patch makes the compat types much more consistent
with the types we are being compatible with and hopefully will fix a few
bugs along the way.
compat type type in compat arch
__compat_[ug]id_t __kernel_[ug]id_t
__compat_[ug]id32_t __kernel_[ug]id32_t
compat_[ug]id_t [ug]id_t
The difference is that compat_uid_t is always 32 bits (for the archs we
care about) but __compat_uid_t may be 16 bits on some.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips')
-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; |