Module Name: src
Committed By: tsutsui
Date: Thu Mar 10 17:05:41 UTC 2011
Modified Files:
src/sys/arch/ews4800mips/ews4800mips: tr2_intr.c tr2a_intr.c
Log Message:
Set correct struct clockframe .intr value for hardclock(9).
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.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/ews4800mips/ews4800mips/tr2_intr.c
diff -u src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c:1.11 src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c:1.12
--- src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c:1.11 Sun Feb 20 07:55:20 2011
+++ src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c Thu Mar 10 17:05:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tr2_intr.c,v 1.11 2011/02/20 07:55:20 matt Exp $ */
+/* $NetBSD: tr2_intr.c,v 1.12 2011/03/10 17:05:41 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2_intr.c,v 1.11 2011/02/20 07:55:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2_intr.c,v 1.12 2011/03/10 17:05:41 tsutsui Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -154,7 +154,7 @@
if (ipending & MIPS_INT_MASK_5) { /* CLOCK */
cf.pc = pc;
cf.sr = status;
- cf.intr = (curcpu()->ci_idepth > 0);
+ cf.intr = (curcpu()->ci_idepth > 1);
*PICNIC_INT5_STATUS_REG = 0;
r = *PICNIC_INT5_STATUS_REG;
Index: src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c
diff -u src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c:1.14 src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c:1.15
--- src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c:1.14 Thu Feb 24 14:40:43 2011
+++ src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c Thu Mar 10 17:05:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tr2a_intr.c,v 1.14 2011/02/24 14:40:43 tsutsui Exp $ */
+/* $NetBSD: tr2a_intr.c,v 1.15 2011/03/10 17:05:41 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2a_intr.c,v 1.14 2011/02/24 14:40:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2a_intr.c,v 1.15 2011/03/10 17:05:41 tsutsui Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -183,7 +183,7 @@
if ((ipending & MIPS_INT_MASK_5) && (intc_cause & INTC_INT5)) {
cf.pc = pc;
cf.sr = status;
- cf.intr = (curcpu()->ci_idepth > 0);
+ cf.intr = (curcpu()->ci_idepth > 1);
tr2a_wbflush();
*INTC_CLEAR_REG = 0x7c;
*INTC_STATUS_REG;
