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/x86/include/lock.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/include/lock.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14.6.1
retrieving revision 1.14.6.2
diff -u -p -r1.14.6.1 -r1.14.6.2
--- src/sys/arch/x86/include/lock.h	2007/10/09 13:38:42	1.14.6.1
+++ src/sys/arch/x86/include/lock.h	2007/12/03 18:40:07	1.14.6.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.14.6.1 2007/10/09 13:38:42 ad Exp $	*/
+/*	$NetBSD: lock.h,v 1.14.6.2 2007/12/03 18:40:07 ad Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -43,13 +43,11 @@
 #ifndef _X86_LOCK_H_
 #define	_X86_LOCK_H_
 
-#if defined(_KERNEL_OPT)
-#include "opt_lockdebug.h"
-#endif
-
 #ifdef _KERNEL
 #include <machine/cpufunc.h>
 #endif
+#include <machine/atomic.h>
+
 
 static __inline int
 __SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
@@ -77,17 +75,6 @@ __cpu_simple_lock_clear(__cpu_simple_loc
 	*__ptr = __SIMPLELOCK_UNLOCKED;
 }
 
-#ifdef LOCKDEBUG
-
-extern void __cpu_simple_lock_init(__cpu_simple_lock_t *);
-extern void __cpu_simple_lock(__cpu_simple_lock_t *);
-extern int __cpu_simple_lock_try(__cpu_simple_lock_t *);
-extern void __cpu_simple_unlock(__cpu_simple_lock_t *);
-
-#else
-
-#include <machine/atomic.h>
-
 static __inline void __cpu_simple_lock_init(__cpu_simple_lock_t *)
 	__attribute__((__unused__));
 static __inline void __cpu_simple_lock(__cpu_simple_lock_t *)
@@ -191,8 +178,6 @@ __cpu_simple_unlock(__cpu_simple_lock_t 
 	*lockp = __SIMPLELOCK_UNLOCKED;
 }
 
-#endif /* !LOCKDEBUG */
-
 #define	SPINLOCK_SPIN_HOOK	/* nothing */
 #define	SPINLOCK_BACKOFF_HOOK	x86_pause()