Module Name: src
Committed By: tsutsui
Date: Thu Mar 10 15:40:36 UTC 2011
Modified Files:
src/sys/arch/newsmips/newsmips: news3400.c news5000.c
Log Message:
Set correct struct clockframe .intr value for hardclock(9).
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/newsmips/newsmips/news3400.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/newsmips/newsmips/news5000.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/newsmips/newsmips/news3400.c
diff -u src/sys/arch/newsmips/newsmips/news3400.c:1.21 src/sys/arch/newsmips/newsmips/news3400.c:1.22
--- src/sys/arch/newsmips/newsmips/news3400.c:1.21 Wed Mar 9 13:21:36 2011
+++ src/sys/arch/newsmips/newsmips/news3400.c Thu Mar 10 15:40:36 2011
@@ -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]++;
Index: src/sys/arch/newsmips/newsmips/news5000.c
diff -u src/sys/arch/newsmips/newsmips/news5000.c:1.19 src/sys/arch/newsmips/newsmips/news5000.c:1.20
--- src/sys/arch/newsmips/newsmips/news5000.c:1.19 Wed Mar 9 13:21:36 2011
+++ src/sys/arch/newsmips/newsmips/news5000.c Thu Mar 10 15:40:36 2011
@@ -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]++;
}
