[rtems commit] timecounter: Merge FreeBSD change r279728

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    ea0b339bbcfee1636918375e55c67e9bc0916021
Changeset: http://git.rtems.org/rtems/commit/?id=ea0b339bbcfee1636918375e55c67e9bc0916021

Author:    Hans Petter Selasky <hselasky at FreeBSD.org>
Date:      Sat Mar  7 18:23:32 2015 +0000

timecounter: Merge FreeBSD change r279728

Add mutex support to the pps_ioctl() API in the kernel. Bump kernel version to reflect structure change.

PR:		196897
MFC after:	1 week

Update #3175.

---

 cpukit/score/include/sys/timepps.h |  5 +++++
 cpukit/score/src/kern_tc.c         | 14 +++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/cpukit/score/include/sys/timepps.h b/cpukit/score/include/sys/timepps.h
index 71d74f5..85bb681 100644
--- a/cpukit/score/include/sys/timepps.h
+++ b/cpukit/score/include/sys/timepps.h
@@ -133,6 +133,8 @@ struct pps_kcbind_args {
 
 #ifdef _KERNEL
 
+struct mtx;
+
 struct pps_state {
 	/* Capture information. */
 	struct timehands *capth;
@@ -140,6 +142,9 @@ struct pps_state {
 	unsigned	capgen;
 	unsigned	capcount;
 
+	/* pointer to mutex protecting this state, if any */
+	struct mtx	*mtx;
+
 	/* State information. */
 	pps_params_t	ppsparam;
 	pps_info_t	ppsinfo;
diff --git a/cpukit/score/src/kern_tc.c b/cpukit/score/src/kern_tc.c
index 242983b..5cdcafb 100644
--- a/cpukit/score/src/kern_tc.c
+++ b/cpukit/score/src/kern_tc.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD r284178 2015-06-09T11:49:56Z$");
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
@@ -1713,17 +1712,10 @@ pps_fetch(struct pps_fetch_args *fapi, struct pps_state *pps)
 		cseq = pps->ppsinfo.clear_sequence;
 		while (aseq == pps->ppsinfo.assert_sequence &&
 		    cseq == pps->ppsinfo.clear_sequence) {
-			if (abi_aware(pps, 1) && pps->driver_mtx != NULL) {
-				if (pps->flags & PPSFLAG_MTX_SPIN) {
-					err = msleep_spin(pps, pps->driver_mtx,
-					    "ppsfch", timo);
-				} else {
-					err = msleep(pps, pps->driver_mtx, PCATCH,
-					    "ppsfch", timo);
-				}
-			} else {
+			if (pps->mtx != NULL)
+				err = msleep(pps, pps->mtx, PCATCH, "ppsfch", timo);
+			else
 				err = tsleep(pps, PCATCH, "ppsfch", timo);
-			}
 			if (err == EWOULDBLOCK && fapi->timeout.tv_sec == -1) {
 				continue;
 			} else if (err != 0) {