From owner-svn-src-projects@FreeBSD.ORG  Sun May  8 14:45:54 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 048FB106564A;
	Sun,  8 May 2011 14:45:54 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EBABA8FC14;
	Sun,  8 May 2011 14:45:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p48Ejru0050765;
	Sun, 8 May 2011 14:45:53 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p48Ejrox050763;
	Sun, 8 May 2011 14:45:53 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201105081445.p48Ejrox050763@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sun, 8 May 2011 14:45:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221663 - projects/largeSMP/lib/libmemstat
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 May 2011 14:45:54 -0000

Author: attilio
Date: Sun May  8 14:45:53 2011
New Revision: 221663
URL: http://svn.freebsd.org/changeset/base/221663

Log:
  Fix a mismerge.

Modified:
  projects/largeSMP/lib/libmemstat/memstat_uma.c

Modified: projects/largeSMP/lib/libmemstat/memstat_uma.c
==============================================================================
--- projects/largeSMP/lib/libmemstat/memstat_uma.c	Sun May  8 14:29:25 2011	(r221662)
+++ projects/largeSMP/lib/libmemstat/memstat_uma.c	Sun May  8 14:45:53 2011	(r221663)
@@ -27,6 +27,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/cpuset.h>
 #include <sys/sysctl.h>
 
 #define	LIBMEMSTAT	/* Cause vm_page.h not to include opt_vmpage.h */