[src/trunk]: src/sys/compat/linux Cleanup, and reduce diffs between arches. M...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e87874686005
branches:  trunk
changeset: 325946:e87874686005
user:      njoly <njoly%NetBSD.org@localhost>
date:      Mon Jan 13 10:33:03 2014 +0000

description:
Cleanup, and reduce diffs between arches. Make alpha use
linux_sys_{get,set}timeofday like others.

diffstat:

 sys/compat/linux/arch/alpha/syscalls.master |  11 +++++------
 sys/compat/linux/common/linux_time.c        |  13 ++-----------
 2 files changed, 7 insertions(+), 17 deletions(-)

diffs (66 lines):

diff -r f2dfaee38016 -r e87874686005 sys/compat/linux/arch/alpha/syscalls.master
--- a/sys/compat/linux/arch/alpha/syscalls.master       Mon Jan 13 08:24:17 2014 +0000
+++ b/sys/compat/linux/arch/alpha/syscalls.master       Mon Jan 13 10:33:03 2014 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.82 2013/12/27 14:17:11 njoly Exp $
+       $NetBSD: syscalls.master,v 1.83 2014/01/13 10:33:03 njoly Exp $
 ;
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 
@@ -580,11 +580,10 @@
 358    STD             { int|linux_sys||select(int nfds, fd_set *readfds, \
                            fd_set *writefds, fd_set *exceptfds, \
                            struct timeval50 *timeout); }
-359    NOARGS          { int|compat_50_sys||gettimeofday( \
-                           struct timeval50 *tp, struct timezone *tzp); }
-360    NOARGS          { int|compat_50_sys||settimeofday( \
-                           const struct timeval50 *tp, \
-                           const struct timezone *tzp); }
+359    STD             { int|linux_sys||gettimeofday(struct timeval50 *tp, \
+                           struct timezone *tzp); }
+360    STD             { int|linux_sys||settimeofday(struct timeval50 *tp, \
+                           struct timezone *tzp); }
 361    NOARGS          { int|compat_50_sys||getitimer(int which, \
                            struct itimerval50 *itv); }
 362    NOARGS          { int|compat_50_sys||setitimer(int which, \
diff -r f2dfaee38016 -r e87874686005 sys/compat/linux/common/linux_time.c
--- a/sys/compat/linux/common/linux_time.c      Mon Jan 13 08:24:17 2014 +0000
+++ b/sys/compat/linux/common/linux_time.c      Mon Jan 13 10:33:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_time.c,v 1.36 2012/10/02 01:44:28 christos Exp $ */
+/*     $NetBSD: linux_time.c,v 1.37 2014/01/13 10:33:03 njoly Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.36 2012/10/02 01:44:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.37 2014/01/13 10:33:03 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
@@ -57,13 +57,6 @@
 #include <compat/common/compat_util.h>
 
 /*
- * This is not implemented for alpha yet
- */
-#if defined (__i386__) || defined (__m68k__) || \
-    defined (__powerpc__) || defined (__mips__) || \
-    defined(__arm__) || defined(__amd64__)
-
-/*
  * Linux keeps track of a system timezone in the kernel. It is readen
  * by gettimeofday and set by settimeofday. This emulates this behavior
  * See linux/kernel/time.c
@@ -122,8 +115,6 @@
        return (0);
 }
 
-#endif /* __i386__ || __m68k__ || __powerpc__ || __mips__ || __arm__ */
-
 void
 native_to_linux_timespec(struct linux_timespec *ltp, struct timespec *ntp)
 {