From dcf40640d1270519e75b36a9a3d204b06eb8a185 Mon Sep 17 00:00:00 2001 From: alc Date: Tue, 18 Jan 2011 04:54:43 +0000 Subject: Move the definition of M_VMPGDATA to the swap pager, where the only remaining uses are. --- sys/vm/swap_pager.c | 1 + sys/vm/vm_pager.c | 2 -- sys/vm/vm_pager.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'sys/vm') diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index be0d42e..f715f8dda 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -147,6 +147,7 @@ struct swblock { daddr_t swb_pages[SWAP_META_PAGES]; }; +static MALLOC_DEFINE(M_VMPGDATA, "vm_pgdata", "swap pager private data"); static struct mtx sw_dev_mtx; static TAILQ_HEAD(, swdevt) swtailq = TAILQ_HEAD_INITIALIZER(swtailq); static struct swdevt *swdevhd; /* Allocate from here next */ diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 473d518..5713ddb 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -82,8 +82,6 @@ __FBSDID("$FreeBSD$"); #include #include -MALLOC_DEFINE(M_VMPGDATA, "vm_pgdata", "XXX: VM pager private data"); - int cluster_pbuf_freecnt = -1; /* unlimited to begin with */ static int dead_pager_getpages(vm_object_t, vm_page_t *, int, int); diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index 519af42..c18719a 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -93,9 +93,6 @@ extern struct pagerops sgpagerops; #define VM_PAGER_CLUSTER_OK 0x0008 #ifdef _KERNEL -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_VMPGDATA); -#endif extern vm_map_t pager_map; extern struct pagerops *pagertab[]; -- cgit v1.1