[src/trunk]: src/sys/arch/newsmips/newsmips Set correct struct clockframe .in...

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

details:   https://anonhg.NetBSD.org/src/rev/30abb1584143
branches:  trunk
changeset: 763124:30abb1584143
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Mar 10 15:40:36 2011 +0000

description:
Set correct struct clockframe .intr value for hardclock(9).

diffstat:

 sys/arch/newsmips/newsmips/news3400.c |   6 +++---
 sys/arch/newsmips/newsmips/news5000.c |  14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r eedbfd010ed2 -r 30abb1584143 sys/arch/newsmips/newsmips/news3400.c
--- a/sys/arch/newsmips/newsmips/news3400.c     Thu Mar 10 15:15:26 2011 +0000
+++ b/sys/arch/newsmips/newsmips/news3400.c     Thu Mar 10 15:40:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: news3400.c,v 1.21 2011/03/09 13:21:36 tsutsui Exp $    */
+/*     $NetBSD: news3400.c,v 1.22 2011/03/10 15:40:36 tsutsui Exp $    */
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: news3400.c,v 1.21 2011/03/09 13:21:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: news3400.c,v 1.22 2011/03/10 15:40:36 tsutsui Exp $");
 
 #define __INTR_PRIVATE
 #include <sys/param.h>
@@ -102,7 +102,7 @@
                                struct clockframe cf = {
                                        .pc = pc,
                                        .sr = status,
-                                       .intr = (curcpu()->ci_idepth > 0),
+                                       .intr = (curcpu()->ci_idepth > 1),
                                };
                                hardclock(&cf);
                                intrcnt[HARDCLOCK_INTR]++;
diff -r eedbfd010ed2 -r 30abb1584143 sys/arch/newsmips/newsmips/news5000.c
--- a/sys/arch/newsmips/newsmips/news5000.c     Thu Mar 10 15:15:26 2011 +0000
+++ b/sys/arch/newsmips/newsmips/news5000.c     Thu Mar 10 15:40:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: news5000.c,v 1.19 2011/03/09 13:21:36 tsutsui Exp $    */
+/*     $NetBSD: news5000.c,v 1.20 2011/03/10 15:40:36 tsutsui Exp $    */
 
 /*-
  * Copyright (C) 1999 SHIMIZU Ryo.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: news5000.c,v 1.19 2011/03/09 13:21:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: news5000.c,v 1.20 2011/03/10 15:40:36 tsutsui Exp $");
 
 #define __INTR_PRIVATE
 #include <sys/param.h>
@@ -89,7 +89,6 @@
                        static int l2cnt = 0;
 #endif
                        uint32_t int2stat;
-                       struct clockframe cf;
 
                        int2stat = *(volatile uint32_t *)NEWS5000_INTST2;
 
@@ -105,11 +104,12 @@
 #endif
 
                        if (int2stat & NEWS5000_INT2_TIMER0) {
+                               struct clockframe cf = {
+                                       .pc = pc,
+                                       .sr = status,
+                                       .intr = (curcpu()->ci_idepth > 1),
+                               };
                                *(volatile uint32_t *)NEWS5000_TIMER0 = 1;
-
-                               cf.pc = pc;
-                               cf.sr = status;
-
                                hardclock(&cf);
                                intrcnt[HARDCLOCK_INTR]++;
                        }