The patch titled
uml: remove unneeded time definitions
has been added to the -mm tree. Its filename is
uml-remove-unneeded-time-definitions.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: remove unneeded time definitions
From: Jeff Dike <jdike@xxxxxxxxxxx>
Remove um_time() and um_stime() syscalls since they are identical to
system-wide ones.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/kernel/time_kern.c | 22 ----------------------
arch/um/sys-i386/sys_call_table.S | 2 --
arch/um/sys-x86_64/syscall_table.c | 6 ------
3 files changed, 30 deletions(-)
diff -puN arch/um/kernel/time_kern.c~uml-remove-unneeded-time-definitions arch/um/kernel/time_kern.c
--- a/arch/um/kernel/time_kern.c~uml-remove-unneeded-time-definitions
+++ a/arch/um/kernel/time_kern.c
@@ -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);
diff -puN arch/um/sys-i386/sys_call_table.S~uml-remove-unneeded-time-definitions arch/um/sys-i386/sys_call_table.S
--- a/arch/um/sys-i386/sys_call_table.S~uml-remove-unneeded-time-definitions
+++ a/arch/um/sys-i386/sys_call_table.S
@@ -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"
diff -puN arch/um/sys-x86_64/syscall_table.c~uml-remove-unneeded-time-definitions arch/um/sys-x86_64/syscall_table.c
--- a/arch/um/sys-x86_64/syscall_table.c~uml-remove-unneeded-time-definitions
+++ a/arch/um/sys-x86_64/syscall_table.c
@@ -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.
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
fix-the-init_env_arg_limit-dependencies.patch
uml-fix-proc-mounts-parsing-boundary-condition.patch
uml-fix-off-by-one-bug-in-vm-file-creation.patch
uml-remove-pte_mkexec.patch
uml-unregister-useless-console-when-its-not-needed.patch
uml-add-locking-to-xtime-accesses.patch
uml-remove-unneeded-time-definitions.patch
uml-remove-stray-file.patch
uml-fix-biarch-gcc-build-on-x86_64.patch
uml-add-__raw_writeq-definition.patch
uml-make-copy__user-atomic.patch
uml-fix-not_dead_yet-when-directory-is-in-bad-state.patch
uml-rename-and-improve-actually_do_remove.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
