diff options
| -rw-r--r-- | sys/vm/vm_page.h | 2 | ||||
| -rw-r--r-- | sys/vm/vm_pageq.c | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index fe215c0..a4077af 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -337,8 +337,6 @@ void vm_page_undirty(vm_page_t m); void vm_page_wakeup(vm_page_t m); void vm_pageq_init(void); -struct vpgqueues *vm_pageq_aquire(int queue); -void vm_pageq_release(struct vpgqueues *vpq); vm_page_t vm_pageq_add_new_page(vm_offset_t pa); void vm_pageq_enqueue(int queue, vm_page_t m); void vm_pageq_remove_nowakeup(vm_page_t m); diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c index 5a5c0c6..9818060 100644 --- a/sys/vm/vm_pageq.c +++ b/sys/vm/vm_pageq.c @@ -24,7 +24,6 @@ #include <vm/vm_extern.h> struct vpgqueues vm_page_queues[PQ_COUNT]; -static struct mtx vm_pageq_mtx[PQ_COUNT]; void vm_pageq_init(void) @@ -43,33 +42,21 @@ vm_pageq_init(void) for (i = 0; i < PQ_COUNT; i++) { TAILQ_INIT(&vm_page_queues[i].pl); - mtx_init(&vm_pageq_mtx[i], "vm pageq mutex", NULL, MTX_DEF); } } -struct vpgqueues * +static __inline struct vpgqueues * vm_pageq_aquire(int queue) { struct vpgqueues *vpq = NULL; if (queue != PQ_NONE) { vpq = &vm_page_queues[queue]; -#if 0 - mtx_lock(&vm_pageq_mtx[queue]); -#endif } return (vpq); } void -vm_pageq_release(struct vpgqueues *vpq) -{ -#if 0 - mtx_unlock(&vm_pageq_mtx[vpq - &vm_page_queues[0]]); -#endif -} - -void vm_pageq_requeue(vm_page_t m) { int queue = m->queue; @@ -78,7 +65,6 @@ vm_pageq_requeue(vm_page_t m) vpq = vm_pageq_aquire(queue); TAILQ_REMOVE(&vpq->pl, m, pageq); TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); - vm_pageq_release(vpq); } /* |
