Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30df4919 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: remove unneeded time definitions 



Remove um_time() and um_stime() syscalls since they are identical to
system-wide ones.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 572e6147

arch/um/kernel/time_kern.c

+0 −22
Original line number Diff line number Diff line
@@ -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);

arch/um/sys-i386/sys_call_table.S

+0 −2
Original line number Diff line number Diff line
@@ -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"

arch/um/sys-x86_64/syscall_table.c

+0 −6
Original line number Diff line number Diff line
@@ -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.