2 files changed, 11 insertions, 9 deletions
diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h
index 3128f70..b3ff55c 100644
--- a/sys/ia64/include/cpufunc.h
+++ b/sys/ia64/include/cpufunc.h
@@ -163,9 +163,6 @@ writel(u_int addr, u_int32_t data)
 	return;			/* TODO: implement this */
 }
 
-/*
- * Bogus interrupt manipulation
- */
 static __inline void
 disable_intr(void)
 {
@@ -178,16 +175,18 @@ enable_intr(void)
 	__asm __volatile (";; ssm psr.i;; srlz.d");
 }
 
-static __inline u_int
-save_intr(void)
+static __inline critical_t
+critical_enter(void)
 {
-	u_int psr;
+	critical_t psr;
+
 	__asm __volatile ("mov %0=psr;;" : "=r" (psr));
-	return psr;
+	disable_intr();
+	return (psr);
 }
 
 static __inline void
-restore_intr(u_int psr)
+critical_exit(critical_t psr)
 {
 	__asm __volatile ("mov psr.l=%0;; srlz.d" :: "r" (psr));
 }
diff --git a/sys/ia64/include/types.h b/sys/ia64/include/types.h
index f8235a2..86ece49 100644
--- a/sys/ia64/include/types.h
+++ b/sys/ia64/include/types.h
@@ -64,8 +64,11 @@ typedef	long		intfptr_t;
 typedef	unsigned long	uintfptr_t;
 #endif
 
+/* Critical section value */
+typedef register_t		critical_t;
+
 /* Interrupt mask (spl, xxx_imask, etc) */
-typedef __uint32_t		intrmask_t;
+typedef __uint64_t		intrmask_t;
 
 /* Interrupt handler function type */
 typedef void			inthand2_t(void *);