convert free list, hash list, and object list to use <sys/queue.h>

SCCS-vsn: sys/vm/vm_page.h 8.2

diff --git a/usr/src/sys/vm/vm_page.h b/usr/src/sys/vm/vm_page.h
index 7c1a118..8a73faa 100644 (file)
--- a/usr/src/sys/vm/vm_page.h
+++ b/usr/src/sys/vm/vm_page.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_page.h   8.1 (Berkeley) %G%
+ *     @(#)vm_page.h   8.2 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -68,19 +68,21 @@
  *     queues (P).
  */
 
  *     queues (P).
  */
 

+TAILQ_HEAD(pglist, vm_page);
+

 struct vm_page {
 struct vm_page {

-       queue_chain_t   pageq;          /* queue info for FIFO
-                                        * queue or free list (P) */
-       queue_chain_t   hashq;          /* hash table links (O)*/
-       queue_chain_t   listq;          /* all pages in same object (O)*/
+       TAILQ_ENTRY(vm_page)    pageq;          /* queue info for FIFO
+                                                * queue or free list (P) */
+       TAILQ_ENTRY(vm_page)    hashq;          /* hash table links (O)*/
+       TAILQ_ENTRY(vm_page)    listq;          /* pages in same object (O)*/

 
 

-       vm_object_t     object;         /* which object am I in (O,P)*/
-       vm_offset_t     offset;         /* offset into that object (O,P) */
+       vm_object_t             object;         /* which object am I in (O,P)*/
+       vm_offset_t             offset;         /* offset into object (O,P) */

 
 

-       u_short         wire_count;     /* number wired down maps use me? (P) */
-       u_short         flags;          /* see below */
+       u_short                 wire_count;     /* wired down maps refs (P) */
+       u_short                 flags;          /* see below */

 
 

-       vm_offset_t     phys_addr;      /* physical address of page */
+       vm_offset_t             phys_addr;      /* physical address of page */

 };
 
 /*
 };
 
 /*


@@ -134,11 +136,11 @@ struct vm_page {
  */
 
 extern
  */
 
 extern

-queue_head_t   vm_page_queue_free;     /* memory free queue */
+struct pglist  vm_page_queue_free;     /* memory free queue */

 extern
 extern

-queue_head_t   vm_page_queue_active;   /* active memory queue */
+struct pglist  vm_page_queue_active;   /* active memory queue */

 extern
 extern

-queue_head_t   vm_page_queue_inactive; /* inactive memory queue */
+struct pglist  vm_page_queue_inactive; /* inactive memory queue */

 
 extern
 vm_page_t      vm_page_array;          /* First resident page in table */
 
 extern
 vm_page_t      vm_page_array;          /* First resident page in table */