Change critical_t to register_t for intr_disable/restore.

This commit is contained in:
dfr 2002-03-21 09:50:11 +00:00
parent 35064c1d50
commit 0b5ce40729
5 changed files with 7 additions and 7 deletions

View File

@ -294,7 +294,7 @@ int
kdb_trap(int vector, struct trapframe *regs)
{
int ddb_mode = !(boothowto & RB_GDB);
critical_t s;
register_t s;
/*
* Don't bother checking for usermode, since a benign entry

View File

@ -581,7 +581,7 @@ pmap_invalidate_all_1(void *arg)
{
u_int64_t addr;
int i, j;
critical_t psr;
register_t psr;
psr = intr_disable();
addr = pmap_ptc_e_base;

View File

@ -85,7 +85,7 @@ sapic_read_rte(struct sapic *sa, int which,
struct sapic_rte *rte)
{
u_int32_t *p = (u_int32_t *) rte;
critical_t c;
register_t c;
c = intr_disable();
p[0] = sapic_read(sa, SAPIC_RTE_BASE + 2*which);
@ -100,7 +100,7 @@ sapic_write_rte(struct sapic *sa, int which,
struct sapic_rte *rte)
{
u_int32_t *p = (u_int32_t *) rte;
critical_t c;
register_t c;
c = intr_disable();
sapic_write(sa, SAPIC_RTE_BASE + 2*which, p[0]);

View File

@ -284,10 +284,10 @@ enable_intr(void)
__asm __volatile (";; ssm psr.i;; srlz.d");
}
static __inline critical_t
static __inline register_t
intr_disable(void)
{
critical_t psr;
register_t psr;
__asm __volatile ("mov %0=psr;;" : "=r" (psr));
disable_intr();

View File

@ -103,7 +103,7 @@ _mcount: \n\
_c = intr_disable()
#define MCOUNT_EXIT(s) \n\
intr_restore(_c)
#define MCOUNT_DECL(s) critical_t c;
#define MCOUNT_DECL(s) register_t c;
#ifdef GUPROF
struct gmonparam;