From owner-svn-src-head@freebsd.org  Mon Feb 22 09:02:28 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 897A7AAF0FE;
 Mon, 22 Feb 2016 09:02:28 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E47212EB;
 Mon, 22 Feb 2016 09:02:28 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1M92RYq088450;
 Mon, 22 Feb 2016 09:02:27 GMT (envelope-from skra@FreeBSD.org)
Received: (from skra@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1M92KoN088386;
 Mon, 22 Feb 2016 09:02:20 GMT (envelope-from skra@FreeBSD.org)
Message-Id: <201602220902.u1M92KoN088386@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skra set sender to
 skra@FreeBSD.org using -f
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Mon, 22 Feb 2016 09:02:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295880 - in head: share/man/man9 sys/amd64/cloudabi64
 sys/amd64/vmm/amd sys/arm/annapurna/alpine sys/arm/arm sys/arm64/arm64
 sys/arm64/cloudabi64 sys/compat/linuxkpi/common/include/lin...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2016 09:02:28 -0000

Author: skra
Date: Mon Feb 22 09:02:20 2016
New Revision: 295880
URL: https://svnweb.freebsd.org/changeset/base/295880

Log:
  As <machine/pmap.h> is included from <vm/pmap.h>, there is no need to
  include it explicitly when <vm/pmap.h> is already included.
  
  Reviewed by:	alc, kib
  Differential Revision:	https://reviews.freebsd.org/D5373

Modified:
  head/share/man/man9/bios.9
  head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  head/sys/amd64/vmm/amd/npt.c
  head/sys/amd64/vmm/amd/svm.c
  head/sys/arm/annapurna/alpine/alpine_machdep.c
  head/sys/arm/arm/mp_machdep.c
  head/sys/arm64/arm64/minidump_machdep.c
  head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
  head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
  head/sys/compat/linuxkpi/common/include/linux/list.h
  head/sys/compat/linuxkpi/common/src/linux_compat.c
  head/sys/compat/linuxkpi/common/src/linux_pci.c
  head/sys/dev/ce/if_ce.c
  head/sys/dev/cp/if_cp.c
  head/sys/dev/drm/drmP.h
  head/sys/dev/drm2/drmP.h
  head/sys/dev/fb/machfb.c
  head/sys/dev/isci/isci_oem_parameters.c
  head/sys/dev/ntb/if_ntb/if_ntb.c
  head/sys/dev/ntb/ntb_hw/ntb_hw.c
  head/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  head/sys/dev/rt/if_rt.c
  head/sys/dev/siba/siba_pcib.c
  head/sys/dev/vt/hw/efifb/efifb.c
  head/sys/i386/bios/mca_machdep.c
  head/sys/i386/pci/pci_cfgreg.c
  head/sys/mips/adm5120/admpci.c
  head/sys/mips/atheros/ar71xx_fixup.c
  head/sys/mips/atheros/ar71xx_pci.c
  head/sys/mips/atheros/ar71xx_spi.c
  head/sys/mips/atheros/ar724x_pci.c
  head/sys/mips/atheros/if_arge.c
  head/sys/mips/atheros/qca955x_pci.c
  head/sys/mips/cavium/cvmx_config.h
  head/sys/mips/cavium/octopci.c
  head/sys/mips/idt/idtpci.c
  head/sys/mips/malta/gt_pci.c
  head/sys/mips/mips/minidump_machdep.c
  head/sys/mips/mips/nexus.c
  head/sys/mips/nlm/xlp_simplebus.c
  head/sys/mips/rt305x/rt305x_pci.c
  head/sys/mips/sibyte/sb_zbpci.c
  head/sys/powerpc/aim/slb.c
  head/sys/powerpc/ofw/ofw_real.c
  head/sys/powerpc/ofw/rtas.c
  head/sys/powerpc/powermac/macgpio.c
  head/sys/powerpc/powermac/macio.c
  head/sys/powerpc/powermac/platform_powermac.c
  head/sys/powerpc/powerpc/genassym.c
  head/sys/powerpc/powerpc/trap.c
  head/sys/powerpc/ps3/if_glc.c
  head/sys/powerpc/ps3/platform_ps3.c
  head/sys/powerpc/ps3/ps3_syscons.c
  head/sys/powerpc/ps3/ps3bus.c
  head/sys/powerpc/ps3/ps3cdrom.c
  head/sys/powerpc/ps3/ps3disk.c
  head/sys/powerpc/pseries/platform_chrp.c
  head/sys/powerpc/psim/iobus.c
  head/sys/sparc64/pci/fire.c
  head/sys/sparc64/sparc64/iommu.c
  head/sys/sparc64/sparc64/tlb.c
  head/sys/x86/acpica/acpi_wakeup.c
  head/sys/x86/x86/nexus.c

Modified: head/share/man/man9/bios.9
==============================================================================
--- head/share/man/man9/bios.9	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/share/man/man9/bios.9	Mon Feb 22 09:02:20 2016	(r295880)
@@ -38,7 +38,6 @@
 .In vm/vm.h
 .In vm/pmap.h
 .In machine/param.h
-.In machine/pmap.h
 .In machine/pc/bios.h
 .Ft uint32_t
 .Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"

Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/frame.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <compat/cloudabi/cloudabi_util.h>

Modified: head/sys/amd64/vmm/amd/npt.c
==============================================================================
--- head/sys/amd64/vmm/amd/npt.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/amd64/vmm/amd/npt.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#include <machine/pmap.h>
-
 #include "npt.h"
 
 SYSCTL_DECL(_hw_vmm);

Modified: head/sys/amd64/vmm/amd/svm.c
==============================================================================
--- head/sys/amd64/vmm/amd/svm.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/amd64/vmm/amd/svm.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpufunc.h>
 #include <machine/psl.h>
-#include <machine/pmap.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <machine/smp.h>

Modified: head/sys/arm/annapurna/alpine/alpine_machdep.c
==============================================================================
--- head/sys/arm/annapurna/alpine/alpine_machdep.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/arm/annapurna/alpine/alpine_machdep.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -42,7 +42,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 <machine/devmap.h>
 #include <machine/platform.h>
 #include <machine/fdt.h>

Modified: head/sys/arm/arm/mp_machdep.c
==============================================================================
--- head/sys/arm/arm/mp_machdep.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/arm/arm/mp_machdep.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/debug_monitor.h>
 #include <machine/smp.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/physmem.h>
 #include <machine/intr.h>
 #include <machine/vmparam.h>

Modified: head/sys/arm64/arm64/minidump_machdep.c
==============================================================================
--- head/sys/arm64/arm64/minidump_machdep.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/arm64/arm64/minidump_machdep.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/md_var.h>
-#include <machine/pmap.h>
 #include <machine/pte.h>
 #include <machine/vmparam.h>
 #include <machine/minidump.h>

Modified: head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/arm64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/arm64/cloudabi64/cloudabi64_sysvec.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/frame.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <compat/cloudabi/cloudabi_util.h>

Modified: head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h	Mon Feb 22 09:02:20 2016	(r295880)
@@ -47,7 +47,6 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 
 enum dma_data_direction {
 	DMA_BIDIRECTIONAL = 0,

Modified: head/sys/compat/linuxkpi/common/include/linux/list.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/list.h	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/compat/linuxkpi/common/include/linux/list.h	Mon Feb 22 09:02:20 2016	(r295880)
@@ -68,7 +68,6 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #define	prefetch(x)
 

Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_compat.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/compat/linuxkpi/common/src/linux_compat.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/stdarg.h>
-#include <machine/pmap.h>
 
 #include <linux/kobject.h>
 #include <linux/device.h>

Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_pci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/compat/linuxkpi/common/src/linux_pci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/stdarg.h>
-#include <machine/pmap.h>
 
 #include <linux/kobject.h>
 #include <linux/device.h>

Modified: head/sys/dev/ce/if_ce.c
==============================================================================
--- head/sys/dev/ce/if_ce.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/ce/if_ce.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ce/ceddk.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>
-#include <machine/pmap.h>
 
 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
 #ifndef PP_FR

Modified: head/sys/dev/cp/if_cp.c
==============================================================================
--- head/sys/dev/cp/if_cp.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/cp/if_cp.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/cp/cpddk.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>
-#include <machine/pmap.h>
 
 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
 #ifndef PP_FR

Modified: head/sys/dev/drm/drmP.h
==============================================================================
--- head/sys/dev/drm/drmP.h	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/drm/drmP.h	Mon Feb 22 09:02:20 2016	(r295880)
@@ -76,7 +76,6 @@ struct drm_file;
 #include <vm/vm_param.h>
 #include <vm/vm_phys.h>
 #include <machine/param.h>
-#include <machine/pmap.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #if defined(__i386__) || defined(__amd64__)

Modified: head/sys/dev/drm2/drmP.h
==============================================================================
--- head/sys/dev/drm2/drmP.h	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/drm2/drmP.h	Mon Feb 22 09:02:20 2016	(r295880)
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 #include <vm/vm_phys.h>
 #include <machine/param.h>
-#include <machine/pmap.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #if defined(__i386__) || defined(__amd64__)

Modified: head/sys/dev/fb/machfb.c
==============================================================================
--- head/sys/dev/fb/machfb.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/fb/machfb.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/bus_private.h>
 #include <machine/ofw_machdep.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/sc_machdep.h>
 

Modified: head/sys/dev/isci/isci_oem_parameters.c
==============================================================================
--- head/sys/dev/isci/isci_oem_parameters.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/isci/isci_oem_parameters.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/isci/isci.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 #include <machine/pc/bios.h>
 #include <dev/isci/scil/scu_bios_definitions.h>

Modified: head/sys/dev/ntb/if_ntb/if_ntb.c
==============================================================================
--- head/sys/dev/ntb/if_ntb/if_ntb.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/ntb/if_ntb/if_ntb.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
-#include <machine/pmap.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>

Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <machine/bus.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>

Modified: head/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
==============================================================================
--- head/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <vm/vm.h>          // 1. for vtophys
 #include <vm/pmap.h>        // 2. for vtophys
-#include <machine/pmap.h>   // 3. for vtophys (yes, three)
 #include <dev/pci/pcivar.h> // For pci_get macros
 #include <dev/pci/pcireg.h>
 #include <sys/endian.h>

Modified: head/sys/dev/rt/if_rt.c
==============================================================================
--- head/sys/dev/rt/if_rt.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/rt/if_rt.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 

Modified: head/sys/dev/siba/siba_pcib.c
==============================================================================
--- head/sys/dev/siba/siba_pcib.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/siba/siba_pcib.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>

Modified: head/sys/dev/vt/hw/efifb/efifb.c
==============================================================================
--- head/sys/dev/vt/hw/efifb/efifb.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/dev/vt/hw/efifb/efifb.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmparam.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #include <dev/vt/vt.h>
 #include <dev/vt/hw/fb/vt_fb.h>

Modified: head/sys/i386/bios/mca_machdep.c
==============================================================================
--- head/sys/i386/bios/mca_machdep.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/i386/bios/mca_machdep.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 #include <machine/md_var.h>
 #include <machine/vm86.h>
 #include <machine/pc/bios.h>

Modified: head/sys/i386/pci/pci_cfgreg.c
==============================================================================
--- head/sys/i386/pci/pci_cfgreg.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/i386/pci/pci_cfgreg.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #ifdef XBOX
 #include <machine/xbox.h>

Modified: head/sys/mips/adm5120/admpci.c
==============================================================================
--- head/sys/mips/adm5120/admpci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/adm5120/admpci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/atheros/ar71xx_fixup.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_fixup.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/atheros/ar71xx_fixup.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_pci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/atheros/ar71xx_pci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/atheros/ar71xx_spi.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_spi.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/atheros/ar71xx_spi.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/pmap.h>
 
 #include <dev/spibus/spi.h>
 #include <dev/spibus/spibusvar.h>

Modified: head/sys/mips/atheros/ar724x_pci.c
==============================================================================
--- head/sys/mips/atheros/ar724x_pci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/atheros/ar724x_pci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/atheros/if_arge.c
==============================================================================
--- head/sys/mips/atheros/if_arge.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/atheros/if_arge.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 

Modified: head/sys/mips/atheros/qca955x_pci.c
==============================================================================
--- head/sys/mips/atheros/qca955x_pci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/atheros/qca955x_pci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/cavium/cvmx_config.h
==============================================================================
--- head/sys/mips/cavium/cvmx_config.h	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/cavium/cvmx_config.h	Mon Feb 22 09:02:20 2016	(r295880)
@@ -50,7 +50,6 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/pmap.h>
 #include <machine/stdarg.h>
 
 #define	asm		__asm

Modified: head/sys/mips/cavium/octopci.c
==============================================================================
--- head/sys/mips/cavium/octopci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/cavium/octopci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/pmap.h>
 
 #include <contrib/octeon-sdk/cvmx.h>
 #include <mips/cavium/octeon_irq.h>

Modified: head/sys/mips/idt/idtpci.c
==============================================================================
--- head/sys/mips/idt/idtpci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/idt/idtpci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/malta/gt_pci.c
==============================================================================
--- head/sys/mips/malta/gt_pci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/malta/gt_pci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/pmap.h>
 
 #include <mips/malta/maltareg.h>
 

Modified: head/sys/mips/mips/minidump_machdep.c
==============================================================================
--- head/sys/mips/mips/minidump_machdep.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/mips/minidump_machdep.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/msgbuf.h>
 #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/mips/mips/nexus.c
==============================================================================
--- head/sys/mips/mips/nexus.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/mips/nexus.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 

Modified: head/sys/mips/nlm/xlp_simplebus.c
==============================================================================
--- head/sys/mips/nlm/xlp_simplebus.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/nlm/xlp_simplebus.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 #include <machine/intr_machdep.h>
 
 #include <mips/nlm/hal/haldefs.h>

Modified: head/sys/mips/rt305x/rt305x_pci.c
==============================================================================
--- head/sys/mips/rt305x/rt305x_pci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/rt305x/rt305x_pci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

Modified: head/sys/mips/sibyte/sb_zbpci.c
==============================================================================
--- head/sys/mips/sibyte/sb_zbpci.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/mips/sibyte/sb_zbpci.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcib_private.h>
 
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 

Modified: head/sys/powerpc/aim/slb.c
==============================================================================
--- head/sys/powerpc/aim/slb.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/aim/slb.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@
 
 #include <machine/md_var.h>
 #include <machine/platform.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 uintptr_t moea64_get_unique_vsid(void);

Modified: head/sys/powerpc/ofw/ofw_real.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_real.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ofw/ofw_real.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <machine/ofw_machdep.h>
-#include <machine/pmap.h>
 #include <machine/stdarg.h>
 
 #include <dev/ofw/openfirm.h>

Modified: head/sys/powerpc/ofw/rtas.c
==============================================================================
--- head/sys/powerpc/ofw/rtas.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ofw/rtas.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/rtas.h>
 #include <machine/stdarg.h>
 

Modified: head/sys/powerpc/powermac/macgpio.c
==============================================================================
--- head/sys/powerpc/powermac/macgpio.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/powermac/macgpio.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -42,7 +42,6 @@
 
 #include <machine/bus.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 

Modified: head/sys/powerpc/powermac/macio.c
==============================================================================
--- head/sys/powerpc/powermac/macio.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/powermac/macio.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@
 
 #include <machine/bus.h>
 #include <machine/intr_machdep.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 

Modified: head/sys/powerpc/powermac/platform_powermac.c
==============================================================================
--- head/sys/powerpc/powermac/platform_powermac.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/powermac/platform_powermac.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/fpu.h>	/* For save_fpu() */
 #include <machine/hid.h>
 #include <machine/platformvar.h>
-#include <machine/pmap.h>
 #include <machine/setjmp.h>
 #include <machine/smp.h>
 #include <machine/spr.h>

Modified: head/sys/powerpc/powerpc/genassym.c
==============================================================================
--- head/sys/powerpc/powerpc/genassym.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/powerpc/genassym.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -52,7 +52,6 @@
 #include <vm/vm_map.h>
 
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/sigframe.h>
 

Modified: head/sys/powerpc/powerpc/trap.c
==============================================================================
--- head/sys/powerpc/powerpc/trap.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/powerpc/trap.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/fpu.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
 #include <machine/spr.h>

Modified: head/sys/powerpc/ps3/if_glc.c
==============================================================================
--- head/sys/powerpc/ps3/if_glc.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ps3/if_glc.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -51,7 +51,6 @@
 #include <machine/pio.h>
 #include <machine/bus.h>
 #include <machine/platform.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>

Modified: head/sys/powerpc/ps3/platform_ps3.c
==============================================================================
--- head/sys/powerpc/ps3/platform_ps3.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ps3/platform_ps3.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/hid.h>
 #include <machine/platform.h>
 #include <machine/platformvar.h>
-#include <machine/pmap.h>
 #include <machine/smp.h>
 #include <machine/spr.h>
 #include <machine/vmparam.h>

Modified: head/sys/powerpc/ps3/ps3_syscons.c
==============================================================================
--- head/sys/powerpc/ps3/ps3_syscons.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ps3/ps3_syscons.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/platform.h>
-#include <machine/pmap.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/vt/vt.h>

Modified: head/sys/powerpc/ps3/ps3bus.c
==============================================================================
--- head/sys/powerpc/ps3/ps3bus.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ps3/ps3bus.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/platform.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 
 #include "ps3bus.h"

Modified: head/sys/powerpc/ps3/ps3cdrom.c
==============================================================================
--- head/sys/powerpc/ps3/ps3cdrom.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ps3/ps3cdrom.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/pio.h>
 #include <machine/bus.h>
 #include <machine/platform.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>

Modified: head/sys/powerpc/ps3/ps3disk.c
==============================================================================
--- head/sys/powerpc/ps3/ps3disk.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/ps3/ps3disk.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/pio.h>
 #include <machine/bus.h>
 #include <machine/platform.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>

Modified: head/sys/powerpc/pseries/platform_chrp.c
==============================================================================
--- head/sys/powerpc/pseries/platform_chrp.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/pseries/platform_chrp.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/hid.h>
 #include <machine/platformvar.h>
-#include <machine/pmap.h>
 #include <machine/rtas.h>
 #include <machine/smp.h>
 #include <machine/spr.h>

Modified: head/sys/powerpc/psim/iobus.c
==============================================================================
--- head/sys/powerpc/psim/iobus.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/powerpc/psim/iobus.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -50,7 +50,6 @@
 #include <machine/vmparam.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #include <machine/resource.h>
 

Modified: head/sys/sparc64/pci/fire.c
==============================================================================
--- head/sys/sparc64/pci/fire.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/sparc64/pci/fire.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus_private.h>
 #include <machine/iommureg.h>
 #include <machine/iommuvar.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 
 #include <dev/pci/pcireg.h>

Modified: head/sys/sparc64/sparc64/iommu.c
==============================================================================
--- head/sys/sparc64/sparc64/iommu.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/sparc64/sparc64/iommu.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -101,7 +101,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/bus_private.h>
 #include <machine/iommureg.h>
-#include <machine/pmap.h>
 #include <machine/resource.h>
 #include <machine/ver.h>
 

Modified: head/sys/sparc64/sparc64/tlb.c
==============================================================================
--- head/sys/sparc64/sparc64/tlb.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/sparc64/sparc64/tlb.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/pmap.h>
 #include <machine/smp.h>
 #include <machine/tlb.h>
 #include <machine/vmparam.h>

Modified: head/sys/x86/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/x86/acpica/acpi_wakeup.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/x86/acpica/acpi_wakeup.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/intr_machdep.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/specialreg.h>
 #include <machine/md_var.h>
 

Modified: head/sys/x86/x86/nexus.c
==============================================================================
--- head/sys/x86/x86/nexus.c	Mon Feb 22 08:22:08 2016	(r295879)
+++ head/sys/x86/x86/nexus.c	Mon Feb 22 09:02:20 2016	(r295880)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmparam.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #include <machine/metadata.h>
 #include <machine/nexusvar.h>