svn commit: r217529 - head/sys/vm

[Alan Cox]

Author: alc
Date: Tue Jan 18 04:54:43 2011
New Revision: 217529
URL: http://svn.freebsd.org/changeset/base/217529

Log:
  Move the definition of M_VMPGDATA to the swap pager, where the only
  remaining uses are.

Modified:
  head/sys/vm/swap_pager.c
  head/sys/vm/vm_pager.c
  head/sys/vm/vm_pager.h

Modified: head/sys/vm/swap_pager.c
==============================================================================
--- head/sys/vm/swap_pager.c	Tue Jan 18 04:13:46 2011	(r217528)
+++ head/sys/vm/swap_pager.c	Tue Jan 18 04:54:43 2011	(r217529)
@@ -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 */

Modified: head/sys/vm/vm_pager.c
==============================================================================
--- head/sys/vm/vm_pager.c	Tue Jan 18 04:13:46 2011	(r217528)
+++ head/sys/vm/vm_pager.c	Tue Jan 18 04:54:43 2011	(r217529)
@@ -82,8 +82,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pager.h>
 #include <vm/vm_extern.h>
 
-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);

Modified: head/sys/vm/vm_pager.h
==============================================================================
--- head/sys/vm/vm_pager.h	Tue Jan 18 04:13:46 2011	(r217528)
+++ head/sys/vm/vm_pager.h	Tue Jan 18 04:54:43 2011	(r217529)
@@ -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[];