Module Name: src
Committed By: cliff
Date: Mon Nov 23 23:48:58 UTC 2009
Modified Files:
src/sys/arch/evbmips/evbmips [matt-nb5-mips64]: interrupt.c
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h
Log Message:
fix types in struct clockframe and args to cpu_intr
to be corect for 32 or 64 bit kernel
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.18.1 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.90.16.7 -r1.90.16.8 src/sys/arch/mips/include/cpu.h
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/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.11 src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.1
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.11 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbmips/evbmips/interrupt.c Mon Nov 23 23:48:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.11 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: interrupt.c,v 1.11.18.1 2009/11/23 23:48:58 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11.18.1 2009/11/23 23:48:58 cliff Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -50,7 +50,7 @@
}
void
-cpu_intr(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending)
+cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
{
struct clockframe cf;
struct cpu_info *ci;
Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.90.16.7 src/sys/arch/mips/include/cpu.h:1.90.16.8
--- src/sys/arch/mips/include/cpu.h:1.90.16.7 Sun Nov 15 00:42:17 2009
+++ src/sys/arch/mips/include/cpu.h Mon Nov 23 23:48:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.90.16.7 2009/11/15 00:42:17 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.90.16.8 2009/11/23 23:48:58 cliff Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -315,16 +315,16 @@
*/
#define cpu_swapout(p) panic("cpu_swapout: can't get here");
-void cpu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void cpu_intr(uint32_t, uint32_t, vaddr_t, uint32_t);
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe.
*/
struct clockframe {
- int pc; /* program counter at time of interrupt */
- int sr; /* status register at time of interrupt */
- int ppl; /* previous priority level at time of interrupt */
+ vaddr_t pc; /* program counter at time of interrupt */
+ uint32_t sr; /* status register at time of interrupt */
+ u_int ppl; /* previous priority level at time of interrupt */
};
/*
