summaryrefslogtreecommitdiff
path: root/sys/sys/lock.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys/lock.h')
-rw-r--r--sys/sys/lock.h35
1 files changed, 1 insertions, 34 deletions
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 5da1c1bfd73..31c1614ed0e 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock.h,v 1.12 2004/06/13 21:49:28 niklas Exp $ */
+/* $OpenBSD: lock.h,v 1.13 2005/05/25 23:17:47 niklas Exp $ */
/*
* Copyright (c) 1995
@@ -239,37 +239,4 @@ void spinlock_acquire_count(__volatile struct lock *, int);
#define LOCK_ASSERT(x) /* nothing */
#endif
-#if defined(MULTIPROCESSOR)
-/*
- * XXX Instead of using struct lock for the kernel lock and thus requiring us
- * XXX to implement simplelocks, causing all sorts of fine-grained locks all
- * XXX over our tree getting activated consuming both time and potentially
- * XXX introducing locking protocol bugs.
- */
-#ifdef notyet
-
-extern struct lock kernel_lock;
-
-/*
- * XXX Simplelock macros used at "trusted" places.
- */
-#define SIMPLELOCK simplelock
-#define SIMPLE_LOCK_INIT simple_lock_init
-#define SIMPLE_LOCK simple_lock
-#define SIMPLE_UNLOCK simple_unlock
-
-#endif
-
-#else
-
-/*
- * XXX Simplelock macros used at "trusted" places.
- */
-#define SIMPLELOCK simplelock
-#define SIMPLE_LOCK_INIT simple_lock_init
-#define SIMPLE_LOCK simple_lock
-#define SIMPLE_UNLOCK simple_unlock
-
-#endif
-
#endif /* !_LOCK_H_ */