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.23.6.2
retrieving revision 1.24
diff -u -p -r1.23.6.2 -r1.24
--- src/sys/arch/x86/include/lock.h	2009/01/17 13:28:38	1.23.6.2
+++ src/sys/arch/x86/include/lock.h	2008/04/28 20:23:40	1.24
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.23.6.2 2009/01/17 13:28:38 mjf Exp $	*/
+/*	$NetBSD: lock.h,v 1.24 2008/04/28 20:23:40 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -36,8 +36,6 @@
 #ifndef _X86_LOCK_H_
 #define	_X86_LOCK_H_
 
-#include <sys/param.h>
-
 static __inline int
 __SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
 {
@@ -64,7 +62,7 @@ __cpu_simple_lock_clear(__cpu_simple_loc
 	*__ptr = __SIMPLELOCK_UNLOCKED;
 }
 
-#ifdef _HARDKERNEL
+#ifdef _KERNEL
 
 #include <machine/cpufunc.h>
 
@@ -181,6 +179,6 @@ __cpu_simple_unlock(__cpu_simple_lock_t 
 	*lockp = __SIMPLELOCK_UNLOCKED;
 }
 
-#endif	/* _HARDKERNEL */
+#endif	/* _KERNEL */
 
 #endif /* _X86_LOCK_H_ */