[src/trunk]: src/sys/arch Set correct struct clockframe .intr value for hardc...

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

details:   https://anonhg.NetBSD.org/src/rev/f553556a51b4
branches:  trunk
changeset: 763132:f553556a51b4
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Mar 10 17:22:51 2011 +0000

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

diffstat:

 sys/arch/emips/emips/interrupt.c   |  5 +++--
 sys/arch/hpcmips/vr/rtc.c          |  6 ++++--
 sys/arch/mipsco/mipsco/mips_3x30.c |  6 +++---
 sys/arch/sgimips/dev/int.c         |  5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diffs (113 lines):

diff -r 23446a6cc53a -r f553556a51b4 sys/arch/emips/emips/interrupt.c
--- a/sys/arch/emips/emips/interrupt.c  Thu Mar 10 17:22:17 2011 +0000
+++ b/sys/arch/emips/emips/interrupt.c  Thu Mar 10 17:22:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: interrupt.c,v 1.2 2011/02/22 08:20:20 matt Exp $       */
+/*     $NetBSD: interrupt.c,v 1.3 2011/03/10 17:22:51 tsutsui Exp $    */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.2 2011/02/22 08:20:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.3 2011/03/10 17:22:51 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -127,6 +127,7 @@
 
        cf.pc = pc;
        cf.sr = status;
+       cf.intr = (curcpu()->ci_idepth > 1);
 
        ipending = TheAic->IrqStatus;
 
diff -r 23446a6cc53a -r f553556a51b4 sys/arch/hpcmips/vr/rtc.c
--- a/sys/arch/hpcmips/vr/rtc.c Thu Mar 10 17:22:17 2011 +0000
+++ b/sys/arch/hpcmips/vr/rtc.c Thu Mar 10 17:22:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtc.c,v 1.26 2009/12/12 14:44:08 tsutsui Exp $ */
+/*     $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.26 2009/12/12 14:44:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $");
 
 #include "opt_vr41xx.h"
 
@@ -44,6 +44,7 @@
 #include <sys/systm.h>
 #include <sys/timetc.h>
 #include <sys/device.h>
+#include <sys/cpu.h>
 
 #include <machine/sysconf.h>
 #include <machine/bus.h>
@@ -230,6 +231,7 @@
        bus_space_write_2(sc->sc_iot, sc->sc_ioh, RTCINT_REG_W, RTCINT_ALL);
        cf.pc = pc;
        cf.sr = statusReg;
+       cf.intr = (curcpu()->ci_idepth > 1);
        hardclock(&cf);
 
        return 0;
diff -r 23446a6cc53a -r f553556a51b4 sys/arch/mipsco/mipsco/mips_3x30.c
--- a/sys/arch/mipsco/mipsco/mips_3x30.c        Thu Mar 10 17:22:17 2011 +0000
+++ b/sys/arch/mipsco/mipsco/mips_3x30.c        Thu Mar 10 17:22:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_3x30.c,v 1.13 2011/02/20 07:56:16 matt Exp $      */
+/*     $NetBSD: mips_3x30.c,v 1.14 2011/03/10 17:30:12 tsutsui Exp $   */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #define        __INTR_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_3x30.c,v 1.13 2011/02/20 07:56:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_3x30.c,v 1.14 2011/03/10 17:30:12 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,7 @@
                
                cf.pc = pc;
                cf.sr = status;
-               cf.intr = (curcpu()->ci_idepth > 0);
+               cf.intr = (curcpu()->ci_idepth > 1);
 
                rambo_clkintr(&cf);
        }
diff -r 23446a6cc53a -r f553556a51b4 sys/arch/sgimips/dev/int.c
--- a/sys/arch/sgimips/dev/int.c        Thu Mar 10 17:22:17 2011 +0000
+++ b/sys/arch/sgimips/dev/int.c        Thu Mar 10 17:22:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: int.c,v 1.22 2011/02/20 07:59:50 matt Exp $    */
+/*     $NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2009 Stephen M. Rumble 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.22 2011/02/20 07:59:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $");
 
 #define __INTR_PRIVATE
 #include "opt_cputype.h"
@@ -639,6 +639,7 @@
 
        cf.pc = pc;
        cf.sr = status;
+       cf.intr = (curcpu()->ci_idepth > 1);
 
        hardclock(&cf);