[src/netbsd-7]: src/sys/arch/arm/arm32 Pull up following revision(s) (request...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce811005ab6c
branches:  netbsd-7
changeset: 799584:ce811005ab6c
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Sep 04 14:48:57 2015 +0000

description:
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.

diffstat:

 sys/arch/arm/arm32/cortex_pmc.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 9e1911938952 -r ce811005ab6c sys/arch/arm/arm32/cortex_pmc.c
--- a/sys/arch/arm/arm32/cortex_pmc.c   Fri Sep 04 14:43:45 2015 +0000
+++ b/sys/arch/arm/arm32/cortex_pmc.c   Fri Sep 04 14:48:57 2015 +0000
@@ -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 @@
                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);
                }