summaryrefslogtreecommitdiff
path: root/kern/processor.c
diff options
context:
space:
mode:
Diffstat (limited to 'kern/processor.c')
-rw-r--r--kern/processor.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/kern/processor.c b/kern/processor.c
index a7c3fbf..bc70dde 100644
--- a/kern/processor.c
+++ b/kern/processor.c
@@ -60,7 +60,7 @@ struct processor processor_array[NCPUS];
queue_head_t all_psets;
int all_psets_count;
-decl_simple_lock_data(, all_psets_lock);
+struct lock all_psets_lock_data;
processor_t master_processor;
processor_t processor_ptr[NCPUS];
@@ -84,7 +84,7 @@ void pset_sys_bootstrap(void)
}
master_processor = cpu_to_processor(master_cpu);
queue_init(&all_psets);
- simple_lock_init(&all_psets_lock);
+ all_psets_lock_init();
queue_enter(&all_psets, &default_pset, processor_set_t, all_psets);
all_psets_count = 1;
default_pset.active = TRUE;
@@ -357,14 +357,14 @@ void pset_deallocate(
pset->ref_count = 1;
pset_ref_unlock(pset);
- simple_lock(&all_psets_lock);
+ lock_all_psets();
pset_ref_lock(pset);
if (--pset->ref_count > 0) {
/*
* Made an extra reference.
*/
pset_ref_unlock(pset);
- simple_unlock(&all_psets_lock);
+ unlock_all_psets();
return;
}
@@ -383,7 +383,7 @@ void pset_deallocate(
all_psets_count--;
pset_ref_unlock(pset);
- simple_unlock(&all_psets_lock);
+ unlock_all_psets();
/*
* That's it, free data structure.
@@ -539,10 +539,10 @@ processor_set_create(
ipc_pset_init(pset);
pset->active = TRUE;
- simple_lock(&all_psets_lock);
+ lock_all_psets();
queue_enter(&all_psets, pset, processor_set_t, all_psets);
all_psets_count++;
- simple_unlock(&all_psets_lock);
+ unlock_all_psets();
ipc_pset_enable(pset);