diff options
| author | Jeff Dike | 2006-06-30 10:55:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-06-30 20:25:38 +0200 |
| commit | 30df49191cf8c7a3d86ccea956ba0de911c1dc36 (patch) | |
| tree | 015e377c4475e56558de5bc9352d880e79efe6a1 /arch/um/kernel/time_kern.c | |
| parent | [PATCH] uml: add locking to xtime accesses (diff) | |
| download | kernel-qcow2-linux-30df49191cf8c7a3d86ccea956ba0de911c1dc36.tar.gz kernel-qcow2-linux-30df49191cf8c7a3d86ccea956ba0de911c1dc36.tar.xz kernel-qcow2-linux-30df49191cf8c7a3d86ccea956ba0de911c1dc36.zip | |
[PATCH] uml: remove unneeded time definitions
Remove um_time() and um_stime() syscalls since they are identical to
system-wide ones.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/time_kern.c')
| -rw-r--r-- | arch/um/kernel/time_kern.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index 08dd727e79e4..820fa3615a3f 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c @@ -142,16 +142,6 @@ irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs) return IRQ_HANDLED; } -long um_time(int __user *tloc) -{ - long ret = get_time() / NSEC_PER_SEC; - - if((tloc != NULL) && put_user(ret, tloc)) - return -EFAULT; - - return ret; -} - void do_gettimeofday(struct timeval *tv) { unsigned long long nsecs = get_time(); @@ -180,18 +170,6 @@ static inline void set_time(unsigned long long nsecs) clock_was_set(); } -long um_stime(int __user *tptr) -{ - int value; - - if (get_user(value, tptr)) - return -EFAULT; - - set_time((unsigned long long) value * NSEC_PER_SEC); - - return 0; -} - int do_settimeofday(struct timespec *tv) { set_time((unsigned long long) tv->tv_sec * NSEC_PER_SEC + tv->tv_nsec); |