From 92257f56a32f16795402cdbeb76a8b4f56ea2369 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 8 Feb 2023 20:17:38 +0100 Subject: slock: Fix initialization of statically-allocated slocks (this is actually a no-op for i386) --- vm/memory_object.c | 2 +- vm/vm_object.c | 4 ++-- vm/vm_resident.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'vm') diff --git a/vm/memory_object.c b/vm/memory_object.c index 41bbf49e..1ea59563 100644 --- a/vm/memory_object.c +++ b/vm/memory_object.c @@ -74,7 +74,7 @@ typedef int memory_object_lock_result_t; /* moved from below */ ipc_port_t memory_manager_default = IP_NULL; -decl_simple_lock_data(,memory_manager_default_lock) +def_simple_lock_data(static,memory_manager_default_lock) /* * Important note: diff --git a/vm/vm_object.c b/vm/vm_object.c index 16b34d4a..b5be3f81 100644 --- a/vm/vm_object.c +++ b/vm/vm_object.c @@ -183,7 +183,7 @@ vm_object_t kernel_object = &kernel_object_store; */ queue_head_t vm_object_cached_list; -decl_simple_lock_data(,vm_object_cached_lock_data) +def_simple_lock_data(static,vm_object_cached_lock_data) #define vm_object_cache_lock() \ simple_lock(&vm_object_cached_lock_data) @@ -199,7 +199,7 @@ decl_simple_lock_data(,vm_object_cached_lock_data) */ int vm_object_cached_pages; -decl_simple_lock_data(,vm_object_cached_pages_lock_data) +def_simple_lock_data(static,vm_object_cached_pages_lock_data) /* * Virtual memory objects are initialized from diff --git a/vm/vm_resident.c b/vm/vm_resident.c index aefdb1f9..e0a03bf5 100644 --- a/vm/vm_resident.c +++ b/vm/vm_resident.c @@ -98,7 +98,7 @@ unsigned long vm_page_bucket_count = 0; /* How big is array? */ unsigned long vm_page_hash_mask; /* Mask for hash function */ static struct list vm_page_queue_fictitious; -decl_simple_lock_data(,vm_page_queue_free_lock) +def_simple_lock_data(,vm_page_queue_free_lock) int vm_page_fictitious_count; int vm_object_external_count; int vm_object_external_pages; @@ -129,7 +129,7 @@ phys_addr_t vm_page_fictitious_addr = (phys_addr_t) -1; * defined here, but are shared by the pageout * module. */ -decl_simple_lock_data(,vm_page_queue_lock) +def_simple_lock_data(,vm_page_queue_lock) int vm_page_active_count; int vm_page_inactive_count; int vm_page_wire_count; -- cgit v1.2.3