[src/trunk]: src/sys/sys Revert rev. 1.30.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/249113a57b86
branches:  trunk
changeset: 487422:249113a57b86
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jun 07 16:37:24 2000 +0000

description:
Revert rev. 1.30.

diffstat:

 sys/sys/lock.h |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (29 lines):

diff -r d47d16ddce42 -r 249113a57b86 sys/sys/lock.h
--- a/sys/sys/lock.h    Wed Jun 07 16:29:11 2000 +0000
+++ b/sys/sys/lock.h    Wed Jun 07 16:37:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lock.h,v 1.30 2000/06/07 16:25:15 tron Exp $   */
+/*     $NetBSD: lock.h,v 1.31 2000/06/07 16:37:24 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -286,10 +286,6 @@
 #define        spinlockmgr(lkp, flags, intrlk)                                 \
        lockmgr((lkp), (flags) | LK_SPIN, (intrlk))
 
-#endif /* _KERNEL */
-
-#if defined(_KERNEL) || defined(_EXTENT_TESTING)
-
 #if defined(LOCKDEBUG)
 void   _simple_lock __P((__volatile struct simplelock *, const char *, int));
 int    _simple_lock_try __P((__volatile struct simplelock *, const char *,
@@ -315,7 +311,6 @@
 #define        simple_unlock(alp)              /* nothing */
 #endif
 
-#endif /* defined(_KERNEL) || defined(_EXTENT_TESTING) */
+#endif /* _KERNEL */
 
 #endif /* _SYS_LOCK_H_ */
-