Avoid a namespace pollution in vm_object.h by defining separately the

structure for vm_radix implementation.

3 files changed, 42 insertions, 8 deletions

diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h
new file mode 100644
index 0000000..7e68518
--- /dev/null
+++ b/sys/vm/_vm_radix.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
+ * Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#ifndef __VM_RADIX_H_
+#define __VM_RADIX_H_
+
+/*
+ * Radix tree root.  The height and pointer are set together to permit
+ * coherent lookups while the root is modified.
+ */
+struct vm_radix {
+	uintptr_t	rt_root;		/* root + height */
+};
+
+#endif /* !__VM_RADIX_H_ */
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 3c60353..84ca0d8 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -71,7 +71,7 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 
-#include <vm/vm_radix.h>
+#include <vm/_vm_radix.h>
 
 /*
  *	Types defined:
diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h
index 1a77b3a..3cd92a0 100644
--- a/sys/vm/vm_radix.h
+++ b/sys/vm/vm_radix.h
@@ -29,13 +29,7 @@
 #ifndef _VM_RADIX_H_
 #define _VM_RADIX_H_
 
-/*
- * Radix tree root.  The height and pointer are set together to permit
- * coherent lookups while the root is modified.
- */
-struct vm_radix {
-	uintptr_t	rt_root;		/* root + height */
-};
+#include <vm/_vm_radix.h>
 
 #ifdef _KERNEL