svn commit: r290257 - head/sys/kern

[Garrett Cooper]

Author: ngie
Date: Mon Nov  2 03:14:37 2015
New Revision: 290257
URL: https://svnweb.freebsd.org/changeset/base/290257

Log:
  Define `fhard` in pps_event(..) only when PPS_SYNC is defined to mute
  an -Wunused-but-set-variable warning
  
  Reported by: FreeBSD_HEAD_amd64_gcc4.9 jenkins job
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/kern/kern_tc.c

Modified: head/sys/kern/kern_tc.c
==============================================================================
--- head/sys/kern/kern_tc.c	Mon Nov  2 01:47:26 2015	(r290256)
+++ head/sys/kern/kern_tc.c	Mon Nov  2 03:14:37 2015	(r290257)
@@ -1702,13 +1702,16 @@ pps_event(struct pps_state *pps, int eve
 	struct bintime bt;
 	struct timespec ts, *tsp, *osp;
 	u_int tcount, *pcount;
-	int foff, fhard;
+	int foff;
 	pps_seq_t *pseq;
 #ifdef FFCLOCK
 	struct timespec *tsp_ffc;
 	pps_seq_t *pseq_ffc;
 	ffcounter *ffcount;
 #endif
+#ifdef PPS_SYNC
+	int fhard;
+#endif
 
 	KASSERT(pps != NULL, ("NULL pps pointer in pps_event"));
 	/* Nothing to do if not currently set to capture this event type. */
@@ -1724,7 +1727,9 @@ pps_event(struct pps_state *pps, int eve
 		tsp = &pps->ppsinfo.assert_timestamp;
 		osp = &pps->ppsparam.assert_offset;
 		foff = pps->ppsparam.mode & PPS_OFFSETASSERT;
+#ifdef PPS_SYNC
 		fhard = pps->kcmode & PPS_CAPTUREASSERT;
+#endif
 		pcount = &pps->ppscount[0];
 		pseq = &pps->ppsinfo.assert_sequence;
 #ifdef FFCLOCK
@@ -1736,7 +1741,9 @@ pps_event(struct pps_state *pps, int eve
 		tsp = &pps->ppsinfo.clear_timestamp;
 		osp = &pps->ppsparam.clear_offset;
 		foff = pps->ppsparam.mode & PPS_OFFSETCLEAR;
+#ifdef PPS_SYNC
 		fhard = pps->kcmode & PPS_CAPTURECLEAR;
+#endif
 		pcount = &pps->ppscount[1];
 		pseq = &pps->ppsinfo.clear_sequence;
 #ifdef FFCLOCK