diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c
index 61eb34884b8c..34ac65d5ec36 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 5e2434fe5ef6..14a62769c66d 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 ae9ef73ed552..208fd5814fb5 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 9ba0d54c3007..713ecf49239e 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 f15a4518a892..a2af1184ad1b 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;