summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-04-02 13:57:21 +0000
committerphk <phk@FreeBSD.org>1999-04-02 13:57:21 +0000
commite4a7067080ec6e0d2320511224f571d572584de3 (patch)
tree1ea9173c1326efe1f71e1d61b5d59c37300466b3 /sys
parenta98f80083cdaff3585f8a3cc476c7b29194baa06 (diff)
downloadFreeBSD-src-e4a7067080ec6e0d2320511224f571d572584de3.zip
FreeBSD-src-e4a7067080ec6e0d2320511224f571d572584de3.tar.gz
Don't open window for race condition.
Detected by: Reg Clemens <reg@dwf.com>
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_clock.c5
-rw-r--r--sys/kern/kern_tc.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 7068d0a..114a592 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.91 1999/03/12 11:09:50 phk Exp $
+ * $Id: kern_clock.c,v 1.92 1999/03/12 21:58:54 phk Exp $
*/
#include "opt_ntp.h"
@@ -907,9 +907,6 @@ pps_event(struct pps_state *pps, struct timecounter *tc, unsigned count, int eve
return;
}
- /* Now, make sure we have the right instance */
- tc = timecounter;
-
/* Nothing really happened */
if (*pcount == count)
return;
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 7068d0a..114a592 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.91 1999/03/12 11:09:50 phk Exp $
+ * $Id: kern_clock.c,v 1.92 1999/03/12 21:58:54 phk Exp $
*/
#include "opt_ntp.h"
@@ -907,9 +907,6 @@ pps_event(struct pps_state *pps, struct timecounter *tc, unsigned count, int eve
return;
}
- /* Now, make sure we have the right instance */
- tc = timecounter;
-
/* Nothing really happened */
if (*pcount == count)
return;
OpenPOWER on IntegriCloud