Date: Fri, 19 Feb 2016 08:35:29 +0000 (UTC) From: Svatopluk Kraus <skra@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295798 - head/sys/arm/include Message-ID: <201602190835.u1J8ZTw0012400@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: skra Date: Fri Feb 19 08:35:29 2016 New Revision: 295798 URL: https://svnweb.freebsd.org/changeset/base/295798 Log: Rename pmap.h to pmap-v4.h and remove pmap-v6.h include from it. Create new pmap.h which includes specific header according to __ARM_ARCH. Note that <machine/pmap.h> is included from <vm/pmap.h> so one common <machine/pmap.h> must exist. Added: head/sys/arm/include/pmap-v4.h - copied, changed from r295797, head/sys/arm/include/pmap.h Replaced: head/sys/arm/include/pmap.h (contents, props changed) Modified: head/sys/arm/include/pmap-v6.h Copied and modified: head/sys/arm/include/pmap-v4.h (from r295797, head/sys/arm/include/pmap.h) ============================================================================== --- head/sys/arm/include/pmap.h Fri Feb 19 06:50:00 2016 (r295797, copy source) +++ head/sys/arm/include/pmap-v4.h Fri Feb 19 08:35:29 2016 (r295798) @@ -46,14 +46,9 @@ * * $FreeBSD$ */ - #include <machine/acle-compat.h> -#if __ARM_ARCH >= 6 -#include <machine/pmap-v6.h> -#else /* __ARM_ARCH >= 6 */ - -#ifndef _MACHINE_PMAP_H_ -#define _MACHINE_PMAP_H_ +#ifndef _MACHINE_PMAP_V4_H_ +#define _MACHINE_PMAP_V4_H_ #include <machine/pte.h> #include <machine/cpuconf.h> @@ -543,5 +538,4 @@ extern vm_paddr_t dump_avail[]; #endif /* !LOCORE */ -#endif /* !_MACHINE_PMAP_H_ */ -#endif /* __ARM_ARCH >= 6 */ +#endif /* !_MACHINE_PMAP_V4_H_ */ Modified: head/sys/arm/include/pmap-v6.h ============================================================================== --- head/sys/arm/include/pmap-v6.h Fri Feb 19 06:50:00 2016 (r295797) +++ head/sys/arm/include/pmap-v6.h Fri Feb 19 08:35:29 2016 (r295798) @@ -45,8 +45,8 @@ * $FreeBSD$ */ -#ifndef _MACHINE_PMAP_H_ -#define _MACHINE_PMAP_H_ +#ifndef _MACHINE_PMAP_V6_H_ +#define _MACHINE_PMAP_V6_H_ #include <sys/queue.h> #include <sys/_cpuset.h> @@ -220,4 +220,4 @@ void pmap_preboot_map_attr(vm_paddr_t, v vm_memattr_t); #endif /* _KERNEL */ -#endif /* !_MACHINE_PMAP_H_ */ +#endif /* !_MACHINE_PMAP_V6_H_ */ Added: head/sys/arm/include/pmap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/include/pmap.h Fri Feb 19 08:35:29 2016 (r295798) @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2016 Svatopluk Kraus + * Copyright (c) 2016 Michal Meloun + * 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. + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_PMAP_H_ +#define _MACHINE_PMAP_H_ + +#include <machine/acle-compat.h> + +#if __ARM_ARCH >= 6 +#include <machine/pmap-v6.h> +#else +#include <machine/pmap-v4.h> +#endif + +#endif /* !_MACHINE_PMAP_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602190835.u1J8ZTw0012400>