From owner-svn-src-user@FreeBSD.ORG Wed Feb 6 18:04:29 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 44092106; Wed, 6 Feb 2013 18:04:29 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 35EACE7A; Wed, 6 Feb 2013 18:04:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r16I4TX3007988; Wed, 6 Feb 2013 18:04:29 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r16I4SLr007985; Wed, 6 Feb 2013 18:04:28 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201302061804.r16I4SLr007985@svn.freebsd.org> From: Attilio Rao Date: Wed, 6 Feb 2013 18:04:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r246423 - user/attilio/vmc-playground/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Feb 2013 18:04:29 -0000 Author: attilio Date: Wed Feb 6 18:04:28 2013 New Revision: 246423 URL: http://svnweb.freebsd.org/changeset/base/246423 Log: Avoid a namespace pollution in vm_object.h by defining separately the structure for vm_radix implementation. Added: user/attilio/vmc-playground/sys/vm/_vm_radix.h (contents, props changed) Modified: user/attilio/vmc-playground/sys/vm/vm_object.h user/attilio/vmc-playground/sys/vm/vm_radix.h Added: user/attilio/vmc-playground/sys/vm/_vm_radix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmc-playground/sys/vm/_vm_radix.h Wed Feb 6 18:04:28 2013 (r246423) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2011 Jeffrey Roberson + * Copyright (c) 2008 Mayur Shardul + * 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_ */ Modified: user/attilio/vmc-playground/sys/vm/vm_object.h ============================================================================== --- user/attilio/vmc-playground/sys/vm/vm_object.h Wed Feb 6 17:47:24 2013 (r246422) +++ user/attilio/vmc-playground/sys/vm/vm_object.h Wed Feb 6 18:04:28 2013 (r246423) @@ -71,7 +71,7 @@ #include #include -#include +#include /* * Types defined: Modified: user/attilio/vmc-playground/sys/vm/vm_radix.h ============================================================================== --- user/attilio/vmc-playground/sys/vm/vm_radix.h Wed Feb 6 17:47:24 2013 (r246422) +++ user/attilio/vmc-playground/sys/vm/vm_radix.h Wed Feb 6 18:04:28 2013 (r246423) @@ -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 #ifdef _KERNEL