Module Name: src
Committed By: ryo
Date: Sun Jun 24 19:04:30 UTC 2018
Modified Files:
src/sys/arch/arm/cortex: gtmr.c
Log Message:
fixed a case of gtmr_cntvct_stable_read() is returning the same value as before.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 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.30 src/sys/arch/arm/cortex/gtmr.c:1.31
--- src/sys/arch/arm/cortex/gtmr.c:1.30 Sun Jun 17 22:42:41 2018
+++ src/sys/arch/arm/cortex/gtmr.c Sun Jun 24 19:04:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.30 2018/06/17 22:42:41 jmcneill Exp $ */
+/* $NetBSD: gtmr.c,v 1.31 2018/06/24 19:04:30 ryo Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.30 2018/06/17 22:42:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.31 2018/06/24 19:04:30 ryo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -261,7 +261,7 @@ gtmr_delay(unsigned int n)
while (ticks > 0) {
arm_isb();
uint64_t curr = gtmr_cntvct_stable_read(sc);
- if (curr > last)
+ if (curr >= last)
ticks -= (curr - last);
else
ticks -= (UINT64_MAX - curr + last);
