--- src/sys/vm/vm_zone.h	2004/10/26 04:33:11	1.6
+++ src/sys/vm/vm_zone.h	2005/09/21 19:48:05	1.7
@@ -16,7 +16,6 @@
  */
 
 #ifndef _SYS_ZONE_H
-
 #define _SYS_ZONE_H
 
 #define ZONE_INTERRUPT 0x0001	/* If you need to allocate at int time */
@@ -25,14 +24,11 @@
 #define ZONE_BOOT      0x0010	/* Internal flag used by zbootinit */
 #define ZONE_USE_RESERVE 0x0020	/* use reserve memory if necessary */
 
-#ifndef _SYS_THREAD_H_
+#include <sys/spinlock.h>
 #include <sys/thread.h>
-#endif
-
-#include	<machine/lock.h>
 
 typedef struct vm_zone {
-	struct lwkt_token zlock;	/* lock for data structure */
+	struct spinlock zlock;		/* lock for data structure */
 	void		*zitems;	/* linked list of items */
 	int		zfreecnt;	/* free entries */
 	int		zfreemin;	/* minimum number of free entries */
@@ -62,4 +58,4 @@ void		zfree (vm_zone_t z, void *item);
 void		zbootinit (vm_zone_t z, char *name, int size, void *item,
 			       int nitems);
 
-#endif /* _SYS_ZONE_H */
+#endif