From 35a0bc126056419b34b7bad9a8488ac20dcdbc8e Mon Sep 17 00:00:00 2001
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Mon, 22 Feb 2016 09:08:04 +0000
Subject: [PATCH] As <machine/vmparam.h> is included from <vm/vm_param.h>,
 there is no need to include it explicitly when <vm/vm_param.h> is already
 included.

Suggested by:	alc
Reviewed by:	alc
Differential Revision:	https://reviews.freebsd.org/D5379
---
 sys/amd64/amd64/minidump_machdep.c            | 1 -
 sys/amd64/vmm/vmm.c                           | 1 -
 sys/arm/arm/genassym.c                        | 1 -
 sys/arm/arm/pmap-v6.c                         | 1 -
 sys/arm/arm/trap-v6.c                         | 1 -
 sys/arm64/arm64/minidump_machdep.c            | 1 -
 sys/arm64/arm64/trap.c                        | 1 -
 sys/cddl/dev/dtrace/aarch64/dtrace_isa.c      | 1 -
 sys/cddl/dev/dtrace/arm/dtrace_isa.c          | 1 -
 sys/cddl/dev/dtrace/mips/dtrace_isa.c         | 1 -
 sys/compat/linux/linux_util.h                 | 1 -
 sys/compat/svr4/svr4_misc.c                   | 1 -
 sys/compat/svr4/svr4_util.h                   | 1 -
 sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c | 1 -
 sys/riscv/riscv/genassym.c                    | 1 -
 sys/riscv/riscv/minidump_machdep.c            | 1 -
 sys/riscv/riscv/trap.c                        | 1 -
 17 files changed, 17 deletions(-)

diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 61b348ea325..cc32cdc2100 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/minidump.h>
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 09870590995..b98152089db 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #include <x86/psl.h>
 #include <x86/apicreg.h>
-#include <machine/vmparam.h>
 
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index 7b742bf512b..f9cb23e810f 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 
 #include <machine/acle-compat.h>
-#include <machine/vmparam.h>
 #include <machine/armreg.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index bb1b0ba1e79..609b291c1f6 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <machine/physmem.h>
-#include <machine/vmparam.h>
 
 #include <vm/vm.h>
 #include <vm/uma.h>
diff --git a/sys/arm/arm/trap-v6.c b/sys/arm/arm/trap-v6.c
index 81a6ee428f6..d0819172a82 100644
--- a/sys/arm/arm/trap-v6.c
+++ b/sys/arm/arm/trap-v6.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>
-#include <machine/vmparam.h>
 
 #ifdef KDB
 #include <sys/kdb.h>
diff --git a/sys/arm64/arm64/minidump_machdep.c b/sys/arm64/arm64/minidump_machdep.c
index a02db58f2ae..56d1713c9f1 100644
--- a/sys/arm64/arm64/minidump_machdep.c
+++ b/sys/arm64/arm64/minidump_machdep.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pte.h>
-#include <machine/vmparam.h>
 #include <machine/minidump.h>
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c
index 10e3f416c2a..1db574273bd 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/pcpu.h>
-#include <machine/vmparam.h>
 
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
index dcda440e879..3d7e0444e78 100644
--- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
@@ -44,7 +44,6 @@
 #include <machine/atomic.h>
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/stack.h>
 #include <ddb/db_sym.h>
 #include <ddb/ddb.h>
diff --git a/sys/cddl/dev/dtrace/arm/dtrace_isa.c b/sys/cddl/dev/dtrace/arm/dtrace_isa.c
index 8e56a44165d..9bac37669a8 100644
--- a/sys/cddl/dev/dtrace/arm/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/arm/dtrace_isa.c
@@ -44,7 +44,6 @@
 #include <machine/atomic.h>
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/stack.h>
 #include <ddb/db_sym.h>
 #include <ddb/ddb.h>
diff --git a/sys/cddl/dev/dtrace/mips/dtrace_isa.c b/sys/cddl/dev/dtrace/mips/dtrace_isa.c
index 4fa03d5c714..c09225c734b 100644
--- a/sys/cddl/dev/dtrace/mips/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/mips/dtrace_isa.c
@@ -44,7 +44,6 @@
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
 #include <machine/mips_opcode.h>
-#include <machine/vmparam.h>
 #include <ddb/db_sym.h>
 #include <ddb/ddb.h>
 #include <sys/kdb.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index a52a7b91d55..7b389a00ff7 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -37,7 +37,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <machine/vmparam.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/syslog.h>
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index b560764ca8e..aaed81f4228 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
 
 #include <security/mac/mac_framework.h>
 
-#include <machine/vmparam.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_map.h>
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index 4cbf230cf52..3fc24511128 100644
--- a/sys/compat/svr4/svr4_util.h
+++ b/sys/compat/svr4/svr4_util.h
@@ -35,7 +35,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <machine/vmparam.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/cdefs.h>
diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index 5c4476f03fe..b692ecb4e87 100644
--- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -100,7 +100,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/frame.h>
-#include <machine/vmparam.h>
 
 #include <sys/bus.h>
 #include <sys/rman.h>
diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c
index bf6c8fb4c85..c5dec83d969 100644
--- a/sys/riscv/riscv/genassym.c
+++ b/sys/riscv/riscv/genassym.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-#include <machine/vmparam.h>
 #include <machine/riscvreg.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>
diff --git a/sys/riscv/riscv/minidump_machdep.c b/sys/riscv/riscv/minidump_machdep.c
index ca51cfc77e5..235d50f1d0b 100644
--- a/sys/riscv/riscv/minidump_machdep.c
+++ b/sys/riscv/riscv/minidump_machdep.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/minidump.h>
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
index c192b3135fe..7ac30c0b087 100644
--- a/sys/riscv/riscv/trap.c
+++ b/sys/riscv/riscv/trap.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/pcpu.h>
-#include <machine/vmparam.h>
 
 #include <machine/resource.h>
 #include <machine/intr.h>