Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new cpu_mchkinfo().

Browse Source
This commit is contained in:
ross 1998-07-13 18:49:34 +00:00
parent 96a07e3f99
commit 0d7c1dede9
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/alpha/alpha/dec_kn300.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn300.c,v 1.7 1998/07/08 16:28:25 mjacob Exp $ */ /* $NetBSD: dec_kn300.c,v 1.8 1998/07/13 18:49:34 ross Exp $ */
/* /*
* Copyright (c) 1998 by Matthew Jacob * Copyright (c) 1998 by Matthew Jacob
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.7 1998/07/08 16:28:25 mjacob Exp $"); __KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.8 1998/07/13 18:49:34 ross Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -427,7 +427,7 @@ kn300_mcheck(mces, type, logout, framep)
/* /*
* If we expected a machine check, just go handle it in common code. * If we expected a machine check, just go handle it in common code.
*/ */
mcp = &mchkinfo[alpha_pal_whami()]; mcp = cpu_mchkinfo();
if (mcp->mc_expected) { if (mcp->mc_expected) {
machine_check(mces, framep, type, logout); machine_check(mces, framep, type, logout);
return; return;

6
sys/arch/alpha/alpha/dec_kn8ae.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn8ae.c,v 1.19 1998/07/08 16:28:25 mjacob Exp $ */ /* $NetBSD: dec_kn8ae.c,v 1.20 1998/07/13 18:49:34 ross Exp $ */
/* /*
* Copyright (c) 1997 by Matthew Jacob * Copyright (c) 1997 by Matthew Jacob
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.19 1998/07/08 16:28:25 mjacob Exp $"); __KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.20 1998/07/13 18:49:34 ross Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -476,7 +476,7 @@ kn8ae_mcheck(mces, type, logout, framep)
/* /*
* If we expected a machine check, just go handle it in common code. * If we expected a machine check, just go handle it in common code.
*/ */
mcp = &mchkinfo[alpha_pal_whami()]; mcp = cpu_mchkinfo();
if (mcp->mc_expected) { if (mcp->mc_expected) {
machine_check(mces, framep, type, logout); machine_check(mces, framep, type, logout);
return; return;

11
sys/arch/alpha/alpha/interrupt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: interrupt.c,v 1.27 1998/07/13 00:14:52 ross Exp $ */ /* $NetBSD: interrupt.c,v 1.28 1998/07/13 18:50:36 ross Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -36,7 +36,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.27 1998/07/13 00:14:52 ross Exp $"); __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.28 1998/07/13 18:50:36 ross Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -140,8 +140,7 @@ machine_check(mces, framep, vector, param)
const char *type; const char *type;
struct mchkinfo *mcp; struct mchkinfo *mcp;
if ((mcp = mchkinfo) != NULL) mcp = cpu_mchkinfo();
mcp += alpha_pal_whami();
/* Make sure it's an error we know about. */ /* Make sure it's an error we know about. */
if ((mces & (ALPHA_MCES_MIP|ALPHA_MCES_SCE|ALPHA_MCES_PCE)) == 0) { if ((mces & (ALPHA_MCES_MIP|ALPHA_MCES_SCE|ALPHA_MCES_PCE)) == 0) {
type = "fatal machine check or error (unknown type)"; type = "fatal machine check or error (unknown type)";
@ -151,7 +150,7 @@ machine_check(mces, framep, vector, param)
/* Machine checks. */ /* Machine checks. */
if (mces & ALPHA_MCES_MIP) { if (mces & ALPHA_MCES_MIP) {
/* If we weren't expecting it, then we punt. */ /* If we weren't expecting it, then we punt. */
if (mcp == NULL || !mcp->mc_expected) { if (!mcp->mc_expected) {
type = "unexpected machine check"; type = "unexpected machine check";
goto fatal; goto fatal;
} }
@ -205,8 +204,8 @@ badaddr_read(addr, size, rptr)
size_t size; size_t size;
void *rptr; void *rptr;
{ {
struct mchkinfo *mcp = &mchkinfo[alpha_pal_whami()];
long rcpt; long rcpt;
struct mchkinfo *mcp = cpu_mchkinfo();
/* Get rid of any stale machine checks that have been waiting. */ /* Get rid of any stale machine checks that have been waiting. */
alpha_pal_draina(); alpha_pal_draina();