From owner-svn-src-head@FreeBSD.ORG  Tue Jan 18 04:54:44 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14FB7106566B;
	Tue, 18 Jan 2011 04:54:44 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 043408FC1E;
	Tue, 18 Jan 2011 04:54:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0I4shSZ024689;
	Tue, 18 Jan 2011 04:54:43 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0I4sh6m024685;
	Tue, 18 Jan 2011 04:54:43 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201101180454.p0I4sh6m024685@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 18 Jan 2011 04:54:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217529 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jan 2011 04:54:44 -0000

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[];