Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/vax/include/mutex.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/vax/include/mutex.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- src/sys/arch/vax/include/mutex.h	2007/02/17 05:34:07	1.3
+++ src/sys/arch/vax/include/mutex.h	2007/02/19 00:31:21	1.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.3 2007/02/17 05:34:07 matt Exp $	*/
+/*	$NetBSD: mutex.h,v 1.4 2007/02/19 00:31:21 ad Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -105,7 +105,8 @@ struct kmutex {
 
 #define	__HAVE_MUTEX_STUBS		1
 #define	__HAVE_SPIN_MUTEX_STUBS		1
-#define	__HAVE_MUTEX_NO_SPIN_ACTIVE_P	1
+
+#define	MUTEX_NO_SPIN_ACTIVE_P(ci)	((ci)->ci_mtx_count == 1)
 
 static inline uintptr_t
 MUTEX_OWNER(uintptr_t owner)
@@ -180,12 +181,6 @@ MUTEX_ADAPTIVE_P(volatile kmutex_t *mtx)
 }
 
 static inline bool
-MUTEX_NO_SPIN_ACTIVE_P(struct cpu_info *ci)
-{
-	return ci->ci_mtx_count == 1;
-}
-
-static inline bool
 MUTEX_ACQUIRE(kmutex_t *mtx, uintptr_t curthread)
 {
 	int rv;