diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-03-26 04:37:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:56:57 -0500 |
commit | 88959ea968709c35e8b979ac9f5a398fa748091a (patch) | |
tree | 7d93892ec8d7b15cd810e4bcb75715c797e01ab3 /arch/ia64/ia32/sys_ia32.c | |
parent | eb76b3fda1f7c2aa2d1523b36835048a15e5e5d2 (diff) |
[PATCH] create struct compat_timex and use it everywhere
We had a copy of the compatibility version of struct timex in each 64 bit
architecture. This patch just creates a global one and replaces all the
usages of the old ones.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kyle McMartin <kyle@parisc-linux.org>
Acked-by: Tony Luck <tony.luck@intel.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64/ia32/sys_ia32.c')
-rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 13e739e4c84..1e1a2353aef 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
@@ -2594,23 +2594,10 @@ sys32_setresgid(compat_gid_t rgid, compat_gid_t egid, | |||
2594 | 2594 | ||
2595 | /* Handle adjtimex compatibility. */ | 2595 | /* Handle adjtimex compatibility. */ |
2596 | 2596 | ||
2597 | struct timex32 { | ||
2598 | u32 modes; | ||
2599 | s32 offset, freq, maxerror, esterror; | ||
2600 | s32 status, constant, precision, tolerance; | ||
2601 | struct compat_timeval time; | ||
2602 | s32 tick; | ||
2603 | s32 ppsfreq, jitter, shift, stabil; | ||
2604 | s32 jitcnt, calcnt, errcnt, stbcnt; | ||
2605 | s32 :32; s32 :32; s32 :32; s32 :32; | ||
2606 | s32 :32; s32 :32; s32 :32; s32 :32; | ||
2607 | s32 :32; s32 :32; s32 :32; s32 :32; | ||
2608 | }; | ||
2609 | |||
2610 | extern int do_adjtimex(struct timex *); | 2597 | extern int do_adjtimex(struct timex *); |
2611 | 2598 | ||
2612 | asmlinkage long | 2599 | asmlinkage long |
2613 | sys32_adjtimex(struct timex32 *utp) | 2600 | sys32_adjtimex(struct compat_timex *utp) |
2614 | { | 2601 | { |
2615 | struct timex txc; | 2602 | struct timex txc; |
2616 | int ret; | 2603 | int ret; |