Module Name: src
Committed By: martin
Date: Fri Sep 4 14:48:57 UTC 2015
Modified Files:
src/sys/arch/arm/arm32 [netbsd-7]: cortex_pmc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #953):
sys/arch/arm/arm32/cortex_pmc.c: revision 1.4
fix: Cortex delay() shorten rarely.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.16.1 src/sys/arch/arm/arm32/cortex_pmc.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/arm32/cortex_pmc.c
diff -u src/sys/arch/arm/arm32/cortex_pmc.c:1.2 src/sys/arch/arm/arm32/cortex_pmc.c:1.2.16.1
--- src/sys/arch/arm/arm32/cortex_pmc.c:1.2 Wed Aug 29 19:10:15 2012
+++ src/sys/arch/arm/arm32/cortex_pmc.c Fri Sep 4 14:48:57 2015
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-/* __KERNEL_RCSID(0, "$NetBSD: cortex_pmc.c,v 1.2 2012/08/29 19:10:15 matt Exp $"); */
+/* __KERNEL_RCSID(0, "$NetBSD: cortex_pmc.c,v 1.2.16.1 2015/09/04 14:48:57 martin Exp $"); */
#include "opt_perfctrs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -101,7 +101,7 @@ delay(u_int arg)
if (ctrl & CORTEX_CNTOFL_C) {
/* Reset overflow flag for cycle counter in overflow register */
armreg_pmovsr_write(CORTEX_CNTOFL_C);
- delta += (last + (counts_per_wrap - cur));
+ delta += (cur + (counts_per_wrap - last));
} else {
delta += (cur - last);
}
