diff options
| -rw-r--r-- | sys/ia64/ia64/db_interface.c | 2 | ||||
| -rw-r--r-- | sys/ia64/ia64/pmap.c | 2 | ||||
| -rw-r--r-- | sys/ia64/ia64/sapic.c | 4 | ||||
| -rw-r--r-- | sys/ia64/include/cpufunc.h | 4 | ||||
| -rw-r--r-- | sys/ia64/include/profile.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c index 61eb348..34ac65d 100644 --- a/sys/ia64/ia64/db_interface.c +++ b/sys/ia64/ia64/db_interface.c @@ -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 diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index 5e2434f..14a6276 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -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; diff --git a/sys/ia64/ia64/sapic.c b/sys/ia64/ia64/sapic.c index ae9ef73..208fd58 100644 --- a/sys/ia64/ia64/sapic.c +++ b/sys/ia64/ia64/sapic.c @@ -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]); diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h index 9ba0d54..713ecf4 100644 --- a/sys/ia64/include/cpufunc.h +++ b/sys/ia64/include/cpufunc.h @@ -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(); diff --git a/sys/ia64/include/profile.h b/sys/ia64/include/profile.h index f15a451..a2af118 100644 --- a/sys/ia64/include/profile.h +++ b/sys/ia64/include/profile.h @@ -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; |
