Remove um_time() and um_stime() syscalls since they are identical to
system-wide ones.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
Index: linux-2.6.17/arch/um/kernel/time_kern.c
===================================================================
--- linux-2.6.17.orig/arch/um/kernel/time_kern.c 2006-06-29 11:45:07.000000000 -0400
+++ linux-2.6.17/arch/um/kernel/time_kern.c 2006-06-29 11:45:07.000000000 -0400
@@ -142,16 +142,6 @@ irqreturn_t um_timer(int irq, void *dev,
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 lon
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);
Index: linux-2.6.17/arch/um/sys-i386/sys_call_table.S
===================================================================
--- linux-2.6.17.orig/arch/um/sys-i386/sys_call_table.S 2006-06-29 11:39:24.000000000 -0400
+++ linux-2.6.17/arch/um/sys-i386/sys_call_table.S 2006-06-29 11:45:07.000000000 -0400
@@ -7,8 +7,6 @@
#define sys_vm86old sys_ni_syscall
#define sys_vm86 sys_ni_syscall
-#define sys_stime um_stime
-#define sys_time um_time
#define old_mmap old_mmap_i386
#include "../../i386/kernel/syscall_table.S"
Index: linux-2.6.17/arch/um/sys-x86_64/syscall_table.c
===================================================================
--- linux-2.6.17.orig/arch/um/sys-x86_64/syscall_table.c 2006-06-29 11:39:24.000000000 -0400
+++ linux-2.6.17/arch/um/sys-x86_64/syscall_table.c 2006-06-29 11:45:07.000000000 -0400
@@ -20,12 +20,6 @@
/*#define sys_set_thread_area sys_ni_syscall
#define sys_get_thread_area sys_ni_syscall*/
-/* For __NR_time. The x86-64 name hopefully will change from sys_time64 to
- * sys_time (since the current situation is bogus). I've sent a patch to cleanup
- * this. Remove below the obsoleted line. */
-#define sys_time64 um_time
-#define sys_time um_time
-
/* On UML we call it this way ("old" means it's not mmap2) */
#define sys_mmap old_mmap
/* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
