diff options
| author | dfr <dfr@FreeBSD.org> | 2002-03-20 17:28:40 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2002-03-20 17:28:40 +0000 |
| commit | b132efc524eb66518b26bf553bd07698212a0838 (patch) | |
| tree | c907dce31cb5b2141848d96f9deb4d43083e37f0 | |
| parent | b5c7ae92bf895ac5b70fbab2b9c2e6eeffd4528a (diff) | |
| download | FreeBSD-src-b132efc524eb66518b26bf553bd07698212a0838.zip FreeBSD-src-b132efc524eb66518b26bf553bd07698212a0838.tar.gz | |
Change intr_enable to intr_restore for consistency with sparc64.
| -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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c index f44fd77..85d21be 100644 --- a/sys/ia64/ia64/db_interface.c +++ b/sys/ia64/ia64/db_interface.c @@ -394,7 +394,7 @@ kdb_trap(int vector, struct trapframe *regs) *regs = ddb_regs; - intr_enable(s); + intr_restore(s); /* diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index b6a795a..d0761ca 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -610,7 +610,7 @@ pmap_invalidate_all_1(void *arg) } addr += pmap_ptc_e_stride1; } - intr_enable(psr); + intr_restore(psr); } static void diff --git a/sys/ia64/ia64/sapic.c b/sys/ia64/ia64/sapic.c index 72279a6..ae9ef73 100644 --- a/sys/ia64/ia64/sapic.c +++ b/sys/ia64/ia64/sapic.c @@ -90,7 +90,7 @@ sapic_read_rte(struct sapic *sa, int which, c = intr_disable(); p[0] = sapic_read(sa, SAPIC_RTE_BASE + 2*which); p[1] = sapic_read(sa, SAPIC_RTE_BASE + 2*which + 1); - intr_enable(c); + intr_restore(c); } #endif @@ -105,7 +105,7 @@ sapic_write_rte(struct sapic *sa, int which, c = intr_disable(); sapic_write(sa, SAPIC_RTE_BASE + 2*which, p[0]); sapic_write(sa, SAPIC_RTE_BASE + 2*which + 1, p[1]); - intr_enable(c); + intr_restore(c); } struct sapic * diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h index e06eba5..9ba0d54 100644 --- a/sys/ia64/include/cpufunc.h +++ b/sys/ia64/include/cpufunc.h @@ -295,7 +295,7 @@ intr_disable(void) } static __inline void -intr_enable(critical_t psr) +intr_restore(critical_t psr) { __asm __volatile ("mov psr.l=%0;; srlz.d" :: "r" (psr)); } @@ -309,7 +309,7 @@ cpu_critical_enter(void) static __inline void cpu_critical_exit(critical_t psr) { - intr_enable(psr); + intr_restore(psr); } #endif /* _KERNEL */ |
