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/lock.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/vax/include/lock.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.16.12.2
retrieving revision 1.16.12.3
diff -u -p -r1.16.12.2 -r1.16.12.3
--- src/sys/arch/vax/include/lock.h	2007/02/26 09:08:39	1.16.12.2
+++ src/sys/arch/vax/include/lock.h	2007/09/03 14:30:48	1.16.12.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.16.12.2 2007/02/26 09:08:39 yamt Exp $	*/
+/*	$NetBSD: lock.h,v 1.16.12.3 2007/09/03 14:30:48 yamt Exp $	*/
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -41,36 +41,38 @@
 #include <machine/cpu.h>
 #endif
 
-static inline void
-__cpu_simple_lock_init(__cpu_simple_lock_t *alp)
+static __inline void __cpu_simple_lock_init(__cpu_simple_lock_t *);
+static __inline void
+__cpu_simple_lock_init(__cpu_simple_lock_t *__alp)
 {
 #ifdef _KERNEL
 	__asm volatile ("movl %0,%%r1;jsb Sunlock"
 		: /* No output */
-		: "g"(alp)
+		: "g"(__alp)
 		: "r1","cc","memory");
 #else
 	__asm volatile ("bbcci $0,%0,1f;1:"
 		: /* No output */
-		: "m"(*alp)
+		: "m"(*__alp)
 		: "cc");
 #endif
 }
 
-static inline int
-__cpu_simple_lock_try(__cpu_simple_lock_t *alp)
+static __inline int __cpu_simple_lock_try(__cpu_simple_lock_t *);
+static __inline int
+__cpu_simple_lock_try(__cpu_simple_lock_t *__alp)
 {
 	int ret;
 
 #ifdef _KERNEL
 	__asm volatile ("movl %1,%%r1;jsb Slocktry;movl %%r0,%0"
 		: "=&r"(ret)
-		: "g"(alp)
+		: "g"(__alp)
 		: "r0","r1","cc","memory");
 #else
 	__asm volatile ("clrl %0;bbssi $0,%1,1f;incl %0;1:"
 		: "=&r"(ret)
-		: "m"(*alp)
+		: "m"(*__alp)
 		: "cc");
 #endif
 
@@ -78,39 +80,50 @@ __cpu_simple_lock_try(__cpu_simple_lock_
 }
 
 #ifdef _KERNEL
+#if defined(MULTIPROCESSOR)
 #define	VAX_LOCK_CHECKS ((1 << IPI_SEND_CNCHAR) | (1 << IPI_DDB))
-#define	__cpu_simple_lock(alp)						\
+#define	__cpu_simple_lock(__alp)					\
 do {									\
 	struct cpu_info *__ci = curcpu();				\
 									\
-	while (__cpu_simple_lock_try(alp) == 0) {			\
-		int ___s;						\
+	while (__cpu_simple_lock_try(__alp) == 0) {			\
+		int __s;						\
 									\
 		if (__ci->ci_ipimsgs & VAX_LOCK_CHECKS) {		\
-			___s = splipi();				\
+			__s = splipi();				\
 			cpu_handle_ipi();				\
-			splx(___s);					\
+			splx(__s);					\
 		}							\
 	}								\
-} while (0)
+} while (/*CONSTCOND*/0)
+#else /* MULTIPROCESSOR */
+#define __cpu_simple_lock(__alp)					\
+do {									\
+	while (__cpu_simple_lock_try(__alp) == 0) {			\
+		;							\
+	}								\
+} while (/*CONSTCOND*/0)
+#endif
 #else
-static inline void
-__cpu_simple_lock(__cpu_simple_lock_t *alp)
+static __inline void __cpu_simple_lock(__cpu_simple_lock_t *);
+static __inline void
+__cpu_simple_lock(__cpu_simple_lock_t *__alp)
 {
 	__asm volatile ("1:bbssi $0,%0,1b"
 		: /* No outputs */
-		: "m"(*alp)
+		: "m"(*__alp)
 		: "cc");
 }
 #endif /* _KERNEL */
 
 #if 0
-static inline void
-__cpu_simple_lock(__cpu_simple_lock_t *alp)
+static __inline void __cpu_simple_lock(__cpu_simple_lock_t *);
+static __inline void
+__cpu_simple_lock(__cpu_simple_lock_t *__alp)
 {
 	struct cpu_info *ci = curcpu();
 
-	while (__cpu_simple_lock_try(alp) == 0) {
+	while (__cpu_simple_lock_try(__alp) == 0) {
 		int s;
 
 		if (ci->ci_ipimsgs & IPI_SEND_CNCHAR) {
@@ -123,29 +136,30 @@ __cpu_simple_lock(__cpu_simple_lock_t *a
 #if 0
 	__asm volatile ("movl %0,%%r1;jsb Slock"
 		: /* No output */
-		: "g"(alp)
+		: "g"(__alp)
 		: "r0","r1","cc","memory");
 #endif
 #if 0
 	__asm volatile ("1:;bbssi $0, %0, 1b"
 		: /* No output */
-		: "m"(*alp));
+		: "m"(*__alp));
 #endif
 }
 #endif
 
-static inline void
-__cpu_simple_unlock(__cpu_simple_lock_t *alp)
+static __inline void __cpu_simple_unlock(__cpu_simple_lock_t *);
+static __inline void
+__cpu_simple_unlock(__cpu_simple_lock_t *__alp)
 {
 #ifdef _KERNEL
 	__asm volatile ("movl %0,%%r1;jsb Sunlock"
 		: /* No output */
-		: "g"(alp)
+		: "g"(__alp)
 		: "r1","cc","memory");
 #else
 	__asm volatile ("bbcci $0,%0,1f;1:"
 		: /* No output */
-		: "m"(*alp)
+		: "m"(*__alp)
 		: "cc");
 #endif
 }
@@ -163,24 +177,26 @@ __cpu_simple_unlock(__cpu_simple_lock_t 
 #define SPINLOCK_SPIN_HOOK						\
 do {									\
 	struct cpu_info *__ci = curcpu();				\
-	int ___s;							\
+	int __s;							\
 									\
 	if (__ci->ci_ipimsgs != 0) {					\
 		/* printf("CPU %lu has IPIs pending\n",			\
 		    __ci->ci_cpuid); */					\
-		___s = splipi();					\
+		__s = splipi();						\
 		cpu_handle_ipi();					\
-		splx(___s);						\
+		splx(__s);						\
 	}								\
-} while (0)
+} while (/*CONSTCOND*/0)
 #endif /* MULTIPROCESSOR */
 
-static inline void
+static __inline void mb_read(void);
+static __inline void
 mb_read(void)
 {
 }
 
-static inline void
+static __inline void mb_write(void);
+static __inline void
 mb_write(void)
 {
 }