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/mips/kernel/linux32.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/mips/kernel/linux32.c')
-rw-r--r-- | arch/mips/kernel/linux32.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 013bc93688e8..f33e779796f0 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -1159,22 +1159,9 @@ out: | |||
1159 | 1159 | ||
1160 | /* Handle adjtimex compatibility. */ | 1160 | /* Handle adjtimex compatibility. */ |
1161 | 1161 | ||
1162 | struct timex32 { | ||
1163 | u32 modes; | ||
1164 | s32 offset, freq, maxerror, esterror; | ||
1165 | s32 status, constant, precision, tolerance; | ||
1166 | struct compat_timeval time; | ||
1167 | s32 tick; | ||
1168 | s32 ppsfreq, jitter, shift, stabil; | ||
1169 | s32 jitcnt, calcnt, errcnt, stbcnt; | ||
1170 | s32 :32; s32 :32; s32 :32; s32 :32; | ||
1171 | s32 :32; s32 :32; s32 :32; s32 :32; | ||
1172 | s32 :32; s32 :32; s32 :32; s32 :32; | ||
1173 | }; | ||
1174 | |||
1175 | extern int do_adjtimex(struct timex *); | 1162 | extern int do_adjtimex(struct timex *); |
1176 | 1163 | ||
1177 | asmlinkage int sys32_adjtimex(struct timex32 __user *utp) | 1164 | asmlinkage int sys32_adjtimex(struct compat_timex __user *utp) |
1178 | { | 1165 | { |
1179 | struct timex txc; | 1166 | struct timex txc; |
1180 | int ret; | 1167 | int ret; |