svn commit: r211229 - head/sys/vm

[Matthew D Fleming]

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_ */