Module Name: src
Committed By: joerg
Date: Tue Dec 17 13:11:18 UTC 2013
Modified Files:
src/sys/arch/arm/cortex: gtmr.c
Log Message:
delta can't be negative. Wrapped value is seen as large positive, so
covered already.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/cortex/gtmr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.4 src/sys/arch/arm/cortex/gtmr.c:1.5
--- src/sys/arch/arm/cortex/gtmr.c:1.4 Thu Sep 12 15:38:04 2013
+++ src/sys/arch/arm/cortex/gtmr.c Tue Dec 17 13:11:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.4 2013/09/12 15:38:04 matt Exp $ */
+/* $NetBSD: gtmr.c,v 1.5 2013/12/17 13:11:18 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.4 2013/09/12 15:38:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.5 2013/12/17 13:11:18 joerg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -277,7 +277,7 @@ clockhandler(void *arg)
* adjust for jitter.
*/
delta -= sc->sc_autoinc;
- if (delta < 0 || delta >= sc->sc_autoinc) {
+ if (delta >= sc->sc_autoinc) {
delta = 0;
}
armreg_cntv_tval_write(sc->sc_autoinc - delta);