diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-03-26 04:37:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:56:57 -0500 |
commit | 3158e9411a66fb98d495ac441c242264f31aaf3e (patch) | |
tree | 7b3bad47214c09c9dcd7ff27316c6de23f4c7cb0 /include/linux | |
parent | 88959ea968709c35e8b979ac9f5a398fa748091a (diff) |
[PATCH] consolidate sys32/compat_adjtimex
Create compat_sys_adjtimex and use it an all appropriate places.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
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 'include/linux')
-rw-r--r-- | include/linux/compat.h | 2 | ||||
-rw-r--r-- | include/linux/timex.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 859f95700d36..24d659cdbafe 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
@@ -207,5 +207,7 @@ static inline int compat_timespec_compare(struct compat_timespec *lhs, | |||
207 | return lhs->tv_nsec - rhs->tv_nsec; | 207 | return lhs->tv_nsec - rhs->tv_nsec; |
208 | } | 208 | } |
209 | 209 | ||
210 | asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp); | ||
211 | |||
210 | #endif /* CONFIG_COMPAT */ | 212 | #endif /* CONFIG_COMPAT */ |
211 | #endif /* _LINUX_COMPAT_H */ | 213 | #endif /* _LINUX_COMPAT_H */ |
diff --git a/include/linux/timex.h b/include/linux/timex.h index 82dc9ae79d37..03914b7e41b1 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
@@ -307,6 +307,8 @@ time_interpolator_reset(void) | |||
307 | /* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */ | 307 | /* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */ |
308 | extern u64 current_tick_length(void); | 308 | extern u64 current_tick_length(void); |
309 | 309 | ||
310 | extern int do_adjtimex(struct timex *); | ||
311 | |||
310 | #endif /* KERNEL */ | 312 | #endif /* KERNEL */ |
311 | 313 | ||
312 | #endif /* LINUX_TIMEX_H */ | 314 | #endif /* LINUX_TIMEX_H */ |