Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 9 Jan 2016 17:12:45 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r293566 - stable/10/sys/compat/linux
Message-ID:  <201601091712.u09HCjh2054458@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dchagin
Date: Sat Jan  9 17:12:45 2016
New Revision: 293566
URL: https://svnweb.freebsd.org/changeset/base/293566

Log:
  MFC r283464:
  
  Delete the duplicate of linux_to_native_clockid() function.

Modified:
  stable/10/sys/compat/linux/linux_time.c
  stable/10/sys/compat/linux/linux_timer.c
  stable/10/sys/compat/linux/linux_timer.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/compat/linux/linux_time.c
==============================================================================
--- stable/10/sys/compat/linux/linux_time.c	Sat Jan  9 17:11:25 2016	(r293565)
+++ stable/10/sys/compat/linux/linux_time.c	Sat Jan  9 17:12:45 2016	(r293566)
@@ -120,8 +120,6 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_
 LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_clockid, "int");
 LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int");
 
-static int linux_to_native_clockid(clockid_t *, clockid_t);
-
 
 void
 native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp)
@@ -152,7 +150,7 @@ linux_to_native_timespec(struct timespec
 	return (0);
 }
 
-static int
+int
 linux_to_native_clockid(clockid_t *n, clockid_t l)
 {
 

Modified: stable/10/sys/compat/linux/linux_timer.c
==============================================================================
--- stable/10/sys/compat/linux/linux_timer.c	Sat Jan  9 17:11:25 2016	(r293565)
+++ stable/10/sys/compat/linux/linux_timer.c	Sat Jan  9 17:12:45 2016	(r293566)
@@ -49,23 +49,6 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <compat/linux/linux_timer.h>
 
-static int
-linux_convert_l_clockid(clockid_t *clock_id)
-{
-
-	switch (*clock_id) {
-	case LINUX_CLOCK_REALTIME:
-		*clock_id = CLOCK_REALTIME;
-		break;
-	case LINUX_CLOCK_MONOTONIC:
-		*clock_id = CLOCK_MONOTONIC;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	return (0);
-}
 
 static int
 linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
@@ -106,6 +89,7 @@ linux_timer_create(struct thread *td, st
 {
 	struct l_sigevent l_ev;
 	struct sigevent ev, *evp;
+	clockid_t nwhich;
 	int error, id;
 
 	if (uap->evp == NULL) {
@@ -119,10 +103,10 @@ linux_timer_create(struct thread *td, st
 			return (error);
 		evp = &ev;
 	}
-	error = linux_convert_l_clockid(&uap->clock_id);
+	error = linux_to_native_clockid(&nwhich, uap->clock_id);
 	if (error != 0)
 		return (error);
-	error = kern_ktimer_create(td, uap->clock_id, evp, &id, -1);
+	error = kern_ktimer_create(td, nwhich, evp, &id, -1);
 	if (error == 0) {
 		error = copyout(&id, uap->timerid, sizeof(int));
 		if (error != 0)
@@ -179,4 +163,3 @@ linux_timer_delete(struct thread *td, st
 
 	return (kern_ktimer_delete(td, uap->timerid));
 }
-

Modified: stable/10/sys/compat/linux/linux_timer.h
==============================================================================
--- stable/10/sys/compat/linux/linux_timer.h	Sat Jan  9 17:11:25 2016	(r293565)
+++ stable/10/sys/compat/linux/linux_timer.h	Sat Jan  9 17:12:45 2016	(r293566)
@@ -115,5 +115,6 @@ void native_to_linux_timespec(struct l_t
 				     struct timespec *);
 int linux_to_native_timespec(struct timespec *,
 				     struct l_timespec *);
+int linux_to_native_clockid(clockid_t *, clockid_t);
 
 #endif	/* _LINUX_TIMER_H */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601091712.u09HCjh2054458>