- Switch from using save/disable/restore_intr to using critical_enter/exit

  and change the u_int mtx_saveintr member of struct mtx to a critical_t
  mtx_savecrit.
- On the alpha we no longer need a custom _get_spin_lock() macro to avoid
  an extra PAL call, so remove it.
- Partially fix using mutexes with WITNESS in modules.  Change all the
  _mtx_{un,}lock_{spin,}_flags() macros to accept explicit file and line
  parameters and rename them to use a prefix of two underscores.  Inside
  of kern_mutex.c, generate wrapper functions for
  _mtx_{un,}lock_{spin,}_flags() (only using a prefix of one underscore)
  that are called from modules.  The macros mtx_{un,}lock_{spin,}_flags()
  are mapped to the __mtx_* macros inside of the kernel to inline the
  usual case of mutex operations and map to the internal _mtx_* functions
  in the module case so that modules will use WITNESS and KTR logging if
  the kernel is compiled with support for it.

1 files changed, 1 insertions, 1 deletions

diff --git a/sys/ia64/include/mutex.h b/sys/ia64/include/mutex.h
index f325f2b..f32bacd 100644
--- a/sys/ia64/include/mutex.h
+++ b/sys/ia64/include/mutex.h
@@ -38,7 +38,7 @@
 
 #ifdef _KERNEL
 
-#define	mtx_intr_enable(mutex)	(mutex)->mtx_saveintr |= IA64_PSR_I
+#define	mtx_intr_enable(mutex)	(mutex)->mtx_savecrit |= IA64_PSR_I
 
 #endif	/* _KERNEL */