Author: ian Date: Sun Oct 27 00:51:46 2013 New Revision: 257199 URL: http://svnweb.freebsd.org/changeset/base/257199
Log: Remove all #include <machine/pmap.h> from arm code. It's already included by vm/pmap.h, which is a prerequisite for arm/machine/pmap.h so there's no reason to ever include it directly. Thanks to alc@ for pointing this out. Modified: head/sys/arm/allwinner/a10_machdep.c head/sys/arm/arm/machdep.c head/sys/arm/arm/minidump_machdep.c head/sys/arm/arm/nexus.c head/sys/arm/broadcom/bcm2835/bcm2835_dma.c head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c head/sys/arm/freescale/imx/imx_machdep.c head/sys/arm/include/fdt.h head/sys/arm/lpc/lpc_machdep.c head/sys/arm/mv/mv_machdep.c head/sys/arm/mv/mvvar.h head/sys/arm/mv/orion/db88f5xxx.c head/sys/arm/rockchip/rk30xx_machdep.c head/sys/arm/sa11x0/sa11x0_io.c head/sys/arm/samsung/exynos/exynos5_machdep.c head/sys/arm/tegra/tegra2_machdep.c head/sys/arm/ti/omap4/pandaboard/pandaboard.c head/sys/arm/ti/ti_machdep.c head/sys/arm/versatile/versatile_machdep.c head/sys/arm/xilinx/zy7_machdep.c head/sys/arm/xscale/i80321/i80321_pci.c head/sys/arm/xscale/i8134x/i81342_pci.c head/sys/arm/xscale/ixp425/ixp425_pci.c Modified: head/sys/arm/allwinner/a10_machdep.c ============================================================================== --- head/sys/arm/allwinner/a10_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/allwinner/a10_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <dev/fdt/fdt_common.h> Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/arm/machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/metadata.h> #include <machine/pcb.h> -#include <machine/pmap.h> #include <machine/reg.h> #include <machine/trap.h> #include <machine/undefined.h> Modified: head/sys/arm/arm/minidump_machdep.c ============================================================================== --- head/sys/arm/arm/minidump_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/arm/minidump_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #endif #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/pmap.h> #include <machine/atomic.h> #include <machine/elf.h> #include <machine/md_var.h> Modified: head/sys/arm/arm/nexus.c ============================================================================== --- head/sys/arm/arm/nexus.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/arm/nexus.c Sun Oct 27 00:51:46 2013 (r257199) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <machine/pcb.h> #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/pmap.h> #include <machine/resource.h> #include <machine/intr.h> Modified: head/sys/arm/broadcom/bcm2835/bcm2835_dma.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_dma.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/broadcom/bcm2835/bcm2835_dma.c Sun Oct 27 00:51:46 2013 (r257199) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/cpu.h> #include <machine/cpufunc.h> -#include <machine/pmap.h> #include "bcm2835_dma.h" #include "bcm2835_vcbus.h" Modified: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <dev/fdt/fdt_common.h> Modified: head/sys/arm/freescale/imx/imx_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/freescale/imx/imx_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <arm/freescale/imx/imx_machdep.h> #include <arm/freescale/imx/imx_wdogreg.h> Modified: head/sys/arm/include/fdt.h ============================================================================== --- head/sys/arm/include/fdt.h Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/include/fdt.h Sun Oct 27 00:51:46 2013 (r257199) @@ -38,7 +38,6 @@ #include <vm/pmap.h> #include <machine/bus.h> -#include <machine/pmap.h> #include <machine/intr.h> /* Max interrupt number */ Modified: head/sys/arm/lpc/lpc_machdep.c ============================================================================== --- head/sys/arm/lpc/lpc_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/lpc/lpc_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <arm/lpc/lpcreg.h> #include <arm/lpc/lpcvar.h> Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/mv/mv_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <arm/mv/mvreg.h> /* XXX */ #include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */ Modified: head/sys/arm/mv/mvvar.h ============================================================================== --- head/sys/arm/mv/mvvar.h Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/mv/mvvar.h Sun Oct 27 00:51:46 2013 (r257199) @@ -44,7 +44,6 @@ #include <machine/bus.h> #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/pmap.h> #include <machine/vm.h> #define MV_TYPE_PCI 0 Modified: head/sys/arm/mv/orion/db88f5xxx.c ============================================================================== --- head/sys/arm/mv/orion/db88f5xxx.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/mv/orion/db88f5xxx.c Sun Oct 27 00:51:46 2013 (r257199) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/intr.h> #include <machine/pte.h> -#include <machine/pmap.h> #include <machine/vmparam.h> #include <arm/mv/mvreg.h> Modified: head/sys/arm/rockchip/rk30xx_machdep.c ============================================================================== --- head/sys/arm/rockchip/rk30xx_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/rockchip/rk30xx_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <dev/fdt/fdt_common.h> Modified: head/sys/arm/sa11x0/sa11x0_io.c ============================================================================== --- head/sys/arm/sa11x0/sa11x0_io.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/sa11x0/sa11x0_io.c Sun Oct 27 00:51:46 2013 (r257199) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_kern.h> #include <machine/bus.h> -#include <machine/pmap.h> /* Proto types for all the bus_space structure functions */ Modified: head/sys/arm/samsung/exynos/exynos5_machdep.c ============================================================================== --- head/sys/arm/samsung/exynos/exynos5_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/samsung/exynos/exynos5_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <dev/fdt/fdt_common.h> Modified: head/sys/arm/tegra/tegra2_machdep.c ============================================================================== --- head/sys/arm/tegra/tegra2_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/tegra/tegra2_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <dev/fdt/fdt_common.h> Modified: head/sys/arm/ti/omap4/pandaboard/pandaboard.c ============================================================================== --- head/sys/arm/ti/omap4/pandaboard/pandaboard.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/ti/omap4/pandaboard/pandaboard.c Sun Oct 27 00:51:46 2013 (r257199) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/pte.h> -#include <machine/pmap.h> #include <machine/vmparam.h> #include <machine/fdt.h> Modified: head/sys/arm/ti/ti_machdep.c ============================================================================== --- head/sys/arm/ti/ti_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/ti/ti_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <arm/ti/omap4/omap4_reg.h> Modified: head/sys/arm/versatile/versatile_machdep.c ============================================================================== --- head/sys/arm/versatile/versatile_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/versatile/versatile_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <dev/fdt/fdt_common.h> Modified: head/sys/arm/xilinx/zy7_machdep.c ============================================================================== --- head/sys/arm/xilinx/zy7_machdep.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/xilinx/zy7_machdep.c Sun Oct 27 00:51:46 2013 (r257199) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <dev/fdt/fdt_common.h> #include <machine/bus.h> -#include <machine/pmap.h> #include <machine/frame.h> #include <machine/machdep.h> Modified: head/sys/arm/xscale/i80321/i80321_pci.c ============================================================================== --- head/sys/arm/xscale/i80321/i80321_pci.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/xscale/i80321/i80321_pci.c Sun Oct 27 00:51:46 2013 (r257199) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_extern.h> -#include <machine/pmap.h> #include <arm/xscale/i80321/i80321reg.h> #include <arm/xscale/i80321/i80321var.h> Modified: head/sys/arm/xscale/i8134x/i81342_pci.c ============================================================================== --- head/sys/arm/xscale/i8134x/i81342_pci.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/xscale/i8134x/i81342_pci.c Sun Oct 27 00:51:46 2013 (r257199) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_extern.h> -#include <machine/pmap.h> #include <arm/xscale/i8134x/i81342reg.h> #include <arm/xscale/i8134x/i81342var.h> Modified: head/sys/arm/xscale/ixp425/ixp425_pci.c ============================================================================== --- head/sys/arm/xscale/ixp425/ixp425_pci.c Sat Oct 26 23:41:11 2013 (r257198) +++ head/sys/arm/xscale/ixp425/ixp425_pci.c Sun Oct 27 00:51:46 2013 (r257199) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> #include <vm/vm_extern.h> -#include <machine/pmap.h> #include <arm/xscale/ixp425/ixp425reg.h> #include <arm/xscale/ixp425/ixp425var.h> _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"