diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-06-30 04:55:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 14:25:38 -0400 |
commit | 30df49191cf8c7a3d86ccea956ba0de911c1dc36 (patch) | |
tree | 015e377c4475e56558de5bc9352d880e79efe6a1 /arch/um/kernel | |
parent | 572e614750c3ed27da1ec6b75dc486066a11fffd (diff) |
[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')
-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) | |||
142 | return IRQ_HANDLED; | 142 | return IRQ_HANDLED; |
143 | } | 143 | } |
144 | 144 | ||
145 | long um_time(int __user *tloc) | ||
146 | { | ||
147 | long ret = get_time() / NSEC_PER_SEC; | ||
148 | |||
149 | if((tloc != NULL) && put_user(ret, tloc)) | ||
150 | return -EFAULT; | ||
151 | |||
152 | return ret; | ||
153 | } | ||
154 | |||
155 | void do_gettimeofday(struct timeval *tv) | 145 | void do_gettimeofday(struct timeval *tv) |
156 | { | 146 | { |
157 | unsigned long long nsecs = get_time(); | 147 | unsigned long long nsecs = get_time(); |
@@ -180,18 +170,6 @@ static inline void set_time(unsigned long long nsecs) | |||
180 | clock_was_set(); | 170 | clock_was_set(); |
181 | } | 171 | } |
182 | 172 | ||
183 | long um_stime(int __user *tptr) | ||
184 | { | ||
185 | int value; | ||
186 | |||
187 | if (get_user(value, tptr)) | ||
188 | return -EFAULT; | ||
189 | |||
190 | set_time((unsigned long long) value * NSEC_PER_SEC); | ||
191 | |||
192 | return 0; | ||
193 | } | ||
194 | |||
195 | int do_settimeofday(struct timespec *tv) | 173 | int do_settimeofday(struct timespec *tv) |
196 | { | 174 | { |
197 | set_time((unsigned long long) tv->tv_sec * NSEC_PER_SEC + tv->tv_nsec); | 175 | set_time((unsigned long long) tv->tv_sec * NSEC_PER_SEC + tv->tv_nsec); |