[src/trunk]: src/sys/arch/hppa/hppa Count traps in uvmexp. Reduces diff to Op...

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

details:   https://anonhg.NetBSD.org/src/rev/43c436849788
branches:  trunk
changeset: 750831:43c436849788
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jan 16 07:17:39 2010 +0000

description:
Count traps in uvmexp. Reduces diff to OpenBSD.

diffstat:

 sys/arch/hppa/hppa/trap.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r e66097e206b0 -r 43c436849788 sys/arch/hppa/hppa/trap.c
--- a/sys/arch/hppa/hppa/trap.c Fri Jan 15 23:57:07 2010 +0000
+++ b/sys/arch/hppa/hppa/trap.c Sat Jan 16 07:17:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.65 2010/01/06 07:42:58 skrll Exp $  */
+/*     $NetBSD: trap.c,v 1.66 2010/01/16 07:17:39 skrll Exp $  */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.65 2010/01/06 07:42:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.66 2010/01/16 07:17:39 skrll Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -558,10 +558,6 @@
        frame_sanity_check(0xdead01, type, frame, l);
 #endif /* DEBUG */
 
-       /* If this is a trap, not an interrupt, reenable interrupts. */
-       if (type_raw != T_INTERRUPT)
-               mtctl(frame->tf_eiem, CR_EIEM);
-
        if (frame->tf_flags & TFF_LAST)
                l->l_md.md_regs = frame;
 
@@ -585,6 +581,12 @@
 #endif
        pcb = lwp_getpcb(l);
 
+       /* If this is a trap, not an interrupt, reenable interrupts. */
+       if (type_raw != T_INTERRUPT) {
+               uvmexp.traps++;
+               mtctl(frame->tf_eiem, CR_EIEM);
+       }
+
        switch (type) {
        case T_NONEXIST:
        case T_NONEXIST|T_USER: