From a2763677ecfaf662b19ea34d0a4936b62cbc6425 Mon Sep 17 00:00:00 2001
From: Doug Rabson <dfr@FreeBSD.org>
Date: Wed, 20 Mar 2002 17:28:40 +0000
Subject: [PATCH] Change intr_enable to intr_restore for consistency with
 sparc64.

---
 sys/ia64/ia64/db_interface.c | 2 +-
 sys/ia64/ia64/pmap.c         | 2 +-
 sys/ia64/ia64/sapic.c        | 4 ++--
 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 f44fd77e154b..85d21be67161 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 b6a795a10adf..d0761cab1fa5 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 72279a6c872e..ae9ef73ed552 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 e06eba582e21..9ba0d54c3007 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 */