slock: Fix initialization of statically-allocated slocks

(this is actually a no-op for i386)

5 files changed, 9 insertions, 12 deletions

diff --git a/device/dev_lookup.c b/device/dev_lookup.c
index 994452cd..c9c39f88 100644
--- a/device/dev_lookup.c
+++ b/device/dev_lookup.c
@@ -60,8 +60,7 @@ queue_head_t	dev_number_hash_table[NDEVHASH];
  * Lock for device-number to device lookup.
  * Must be held before device-ref_count lock.
  */
-decl_simple_lock_data(,
-		dev_number_lock)
+def_simple_lock_data(static, dev_number_lock)
 
 struct kmem_cache	dev_hdr_cache;
 
diff --git a/device/dev_pager.c b/device/dev_pager.c
index d9d22489..1cd74064 100644
--- a/device/dev_pager.c
+++ b/device/dev_pager.c
@@ -167,8 +167,7 @@ typedef struct dev_pager_entry *dev_pager_entry_t;
  */
 queue_head_t	dev_pager_hashtable[DEV_HASH_COUNT];
 struct kmem_cache	dev_pager_hash_cache;
-decl_simple_lock_data(,
-		dev_pager_hash_lock)
+def_simple_lock_data(static, dev_pager_hash_lock)
 
 struct dev_device_entry {
 	queue_chain_t	links;
@@ -184,8 +183,7 @@ typedef struct dev_device_entry *dev_device_entry_t;
  */
 queue_head_t	dev_device_hashtable[DEV_HASH_COUNT];
 struct kmem_cache	dev_device_hash_cache;
-decl_simple_lock_data(,
-		dev_device_hash_lock)
+def_simple_lock_data(static, dev_device_hash_lock)
 
 #define	dev_hash(name_port) \
 		(((vm_offset_t)(name_port) & 0xffffff) % DEV_HASH_COUNT)
diff --git a/device/ds_routines.c b/device/ds_routines.c
index 6d629f69..07ab7b30 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -1508,7 +1508,7 @@ ds_no_senders(mach_no_senders_notification_t *notification)
 }
 
 queue_head_t		io_done_list;
-decl_simple_lock_data(,	io_done_list_lock)
+def_simple_lock_data(static,	io_done_list_lock)
 
 #define	splio	splsched	/* XXX must block ALL io devices */
 
diff --git a/device/kmsg.c b/device/kmsg.c
index e49eb3d3..4885d7b3 100644
--- a/device/kmsg.c
+++ b/device/kmsg.c
@@ -44,7 +44,7 @@ static queue_head_t kmsg_read_queue;
 /* Used for exclusive access to the device */
 static boolean_t kmsg_in_use;
 /* Used for exclusive access to the routines */
-decl_simple_lock_data (static, kmsg_lock);
+def_simple_lock_data (static, kmsg_lock);
 /* If already initialized or not  */
 static boolean_t kmsg_init_done = FALSE;
 
diff --git a/device/net_io.c b/device/net_io.c
index d1cd5a67..bad6d3eb 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -86,7 +86,7 @@ int kttd_async_counter= 0;
  * Messages can be high priority or low priority.
  * The network thread processes high priority messages first.
  */
-decl_simple_lock_data(,net_queue_lock)
+def_simple_lock_data(static,net_queue_lock)
 boolean_t	net_thread_awake = FALSE;
 struct ipc_kmsg_queue	net_queue_high;
 int		net_queue_high_size = 0;
@@ -99,7 +99,7 @@ int		net_queue_low_max = 0;		/* for debugging */
  * List of net kmsgs that can be touched at interrupt level.
  * If it is empty, we will also steal low priority messages.
  */
-decl_simple_lock_data(,net_queue_free_lock)
+def_simple_lock_data(static,net_queue_free_lock)
 struct ipc_kmsg_queue	net_queue_free;
 int		net_queue_free_size = 0;	/* on free list */
 int		net_queue_free_max = 0;		/* for debugging */
@@ -125,7 +125,7 @@ int		net_kmsg_send_low_misses = 0;	/* for debugging */
 int		net_thread_awaken = 0;		/* for debugging */
 int		net_ast_taken = 0;		/* for debugging */
 
-decl_simple_lock_data(,net_kmsg_total_lock)
+def_simple_lock_data(static,net_kmsg_total_lock)
 int		net_kmsg_total = 0;		/* total allocated */
 int		net_kmsg_max;			/* initialized below */
 
@@ -337,7 +337,7 @@ struct net_hash_header {
         net_hash_entry_t table[NET_HASH_SIZE];
 } filter_hash_header[N_NET_HASH];
 
-decl_simple_lock_data(,net_hash_header_lock)
+def_simple_lock_data(static,net_hash_header_lock)
 
 #define HASH_ITERATE(head, elt) (elt) = (net_hash_entry_t) (head); do {
 #define HASH_ITERATE_END(head, elt) \