PERFORCE change 103752 for review

[Roman Divacky]

http://perforce.freebsd.org/chv.cgi?CH=103752

Change 103752 by rdivacky at rdivacky_witten on 2006/08/13 11:42:29

	Remove usage of linux_timespec and use l_timespec instead.

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#3 edit
.. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#16 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#3 (text+ko) ====

@@ -58,21 +58,21 @@
 #include <machine/../linux/linux_proto.h>
 #endif
 
-static void native_to_linux_timespec(struct linux_timespec *,
+static void native_to_linux_timespec(struct l_timespec *,
 				     struct timespec *);
 static void linux_to_native_timespec(struct timespec *,
-				     struct linux_timespec *);
+				     struct l_timespec *);
 static int linux_to_native_clockid(clockid_t *, clockid_t);
 
 static void
-native_to_linux_timespec(struct linux_timespec *ltp, struct timespec *ntp)
+native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp)
 {
 	ltp->tv_sec = ntp->tv_sec;
 	ltp->tv_nsec = ntp->tv_nsec;
 }
 
 static void
-linux_to_native_timespec(struct timespec *ntp, struct linux_timespec *ltp)
+linux_to_native_timespec(struct timespec *ntp, struct l_timespec *ltp)
 {
 	ntp->tv_sec = ltp->tv_sec;
 	ntp->tv_nsec = ltp->tv_nsec;
@@ -101,7 +101,7 @@
 int
 linux_clock_gettime(struct thread *td, struct linux_clock_gettime_args *args)
 {
-	struct linux_timespec lts;
+	struct l_timespec lts;
 	int error;
 	clockid_t nwhich = 0;	/* XXX: GCC */
 	struct timespec tp;
@@ -123,7 +123,7 @@
 linux_clock_settime(struct thread *td, struct linux_clock_settime_args *args)
 {
 	struct timespec ts;
-	struct linux_timespec lts;
+	struct l_timespec lts;
 	int error;
 	clockid_t nwhich = 0;	/* XXX: GCC */
 
@@ -144,7 +144,7 @@
 linux_clock_getres(struct thread *td, struct linux_clock_getres_args *args)
 {
 	struct timespec ts;
-	struct linux_timespec lts;
+	struct l_timespec lts;
 	int error;
 	clockid_t nwhich = 0;	/* XXX: GCC */
 
@@ -168,7 +168,7 @@
 linux_clock_nanosleep(struct thread *td, struct linux_clock_nanosleep_args *args)
 {
 	struct timespec *rmtp;
-	struct linux_timespec lrqts, lrmts;
+	struct l_timespec lrqts, lrmts;
 	struct timespec rqts, rmts;
 	int error;
 

==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#16 (text+ko) ====

@@ -816,12 +816,6 @@
 #define EMUL_LOCKED		1
 #define EMUL_UNLOCKED		0
 
-typedef long linux_time_t;
-struct linux_timespec {
-        linux_time_t    tv_sec;         /* seconds */
-        long            tv_nsec;        /* nanoseconds */
-};
-
 #define LINUX_CLOCK_REALTIME            0
 #define LINUX_CLOCK_MONOTONIC           1
 #define LINUX_CLOCK_PROCESS_CPUTIME_ID  2