diff options
author | bapt <bapt@FreeBSD.org> | 2015-08-09 00:15:17 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-08-09 00:15:17 +0000 |
commit | 2c81d1658920f732f451e9edffa48cf9b90607b1 (patch) | |
tree | 20549ce39ea8b5a45adaa22dbf88f3cba90d926d /sys/kern/kern_tc.c | |
parent | ee75e8628c34502fa04b16cab8adb0a4ab24a2fc (diff) | |
parent | 9e0d1c3e199cfcd8480d2e892da387ebb1bbde8b (diff) | |
download | FreeBSD-src-2c81d1658920f732f451e9edffa48cf9b90607b1.zip FreeBSD-src-2c81d1658920f732f451e9edffa48cf9b90607b1.tar.gz |
Merge from HEAD
Diffstat (limited to 'sys/kern/kern_tc.c')
-rw-r--r-- | sys/kern/kern_tc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 922e9bf..d09f0b6 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1703,6 +1703,9 @@ pps_event(struct pps_state *pps, int event) #endif KASSERT(pps != NULL, ("NULL pps pointer in pps_event")); + /* Nothing to do if not currently set to capture this event type. */ + if ((event & pps->ppsparam.mode) == 0) + return; /* If the timecounter was wound up underneath us, bail out. */ if (pps->capgen == 0 || pps->capgen != atomic_load_acq_int(&pps->capth->th_generation)) |