From owner-svn-src-all@FreeBSD.ORG  Thu Aug 12 16:54:44 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53DC2106566C;
	Thu, 12 Aug 2010 16:54:44 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4401C8FC16;
	Thu, 12 Aug 2010 16: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 o7CGsi2p038129;
	Thu, 12 Aug 2010 16:54:44 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7CGsiO3038126;
	Thu, 12 Aug 2010 16:54:44 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201008121654.o7CGsiO3038126@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Thu, 12 Aug 2010 16:54:44 +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: r211229 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Aug 2010 16:54:44 -0000

Author: mdf
Date: Thu Aug 12 16:54:43 2010
New Revision: 211229
URL: http://svn.freebsd.org/changeset/base/211229

Log:
  Fix compile.  It seemed better to have memguard.c include opt_vm.h in
  case future compile-time knobs were added that it wants to use.
  Also add include guards and forward declarations to vm/memguard.h.
  
  Approved by:    zml (mentor)
  MFC after:      1 month

Modified:
  head/sys/vm/memguard.c
  head/sys/vm/memguard.h

Modified: head/sys/vm/memguard.c
==============================================================================
--- head/sys/vm/memguard.c	Thu Aug 12 16:13:24 2010	(r211228)
+++ head/sys/vm/memguard.c	Thu Aug 12 16:54:43 2010	(r211229)
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
  * See the memguard(9) man page for more information on using MemGuard.
  */
 
+#include "opt_vm.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: head/sys/vm/memguard.h
==============================================================================
--- head/sys/vm/memguard.h	Thu Aug 12 16:13:24 2010	(r211228)
+++ head/sys/vm/memguard.h	Thu Aug 12 16:54:43 2010	(r211229)
@@ -26,8 +26,14 @@
  * $FreeBSD$
  */
 
+#ifndef _VM_MEMGUARD_H_
+#define	_VM_MEMGUARD_H_
+
 #include "opt_vm.h"
 
+struct malloc_type;
+struct vm_map;
+
 #ifdef DEBUG_MEMGUARD
 unsigned long	memguard_fudge(unsigned long, unsigned long);
 void	memguard_init(struct vm_map *);
@@ -43,3 +49,5 @@ int	is_memguard_addr(void *);
 #define	memguard_cmp(mtp, size)		0
 #define	is_memguard_addr(addr)		0
 #endif
+
+#endif /* _VM_MEMGUARD_H_ */