From owner-svn-src-stable@FreeBSD.ORG Fri Dec 13 20:43:29 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BB92408; Fri, 13 Dec 2013 20:43:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 439441AD5; Fri, 13 Dec 2013 20:43:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBDKhTnH014468; Fri, 13 Dec 2013 20:43:29 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBDKhCpN014366; Fri, 13 Dec 2013 20:43:12 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201312132043.rBDKhCpN014366@svn.freebsd.org> From: Ian Lepore Date: Fri, 13 Dec 2013 20:43:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259329 - in stable/10/sys/arm: allwinner allwinner/a20 arm at91 broadcom/bcm2835 econa freescale/imx include lpc mv mv/orion rockchip sa11x0 samsung/exynos tegra ti ti/am335x ti/omap4 ... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 20:43:29 -0000 Author: ian Date: Fri Dec 13 20:43:11 2013 New Revision: 259329 URL: http://svnweb.freebsd.org/changeset/base/259329 Log: MFC r257199, r257200, r257217: Remove all #include 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. Remove #include from all the arm code that doesn't really need it. That would be almost everywhere it was included. Add it in a couple files that really do need it and were previously getting it by accident via another header. Remove the last dregs of trapframe_t. It turns out only arm was using this type, so remove it to make arm code more consistant with other platforms. Modified: stable/10/sys/arm/allwinner/a10_clk.c stable/10/sys/arm/allwinner/a10_gpio.c stable/10/sys/arm/allwinner/a10_machdep.c stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c stable/10/sys/arm/allwinner/timer.c stable/10/sys/arm/arm/cpufunc.c stable/10/sys/arm/arm/genassym.c stable/10/sys/arm/arm/generic_timer.c stable/10/sys/arm/arm/machdep.c stable/10/sys/arm/arm/minidump_machdep.c stable/10/sys/arm/arm/mpcore_timer.c stable/10/sys/arm/arm/nexus.c stable/10/sys/arm/arm/trap.c stable/10/sys/arm/arm/undefined.c stable/10/sys/arm/arm/vfp.c stable/10/sys/arm/arm/vm_machdep.c stable/10/sys/arm/at91/at91_mci.c stable/10/sys/arm/at91/at91_pmc.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_fb.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_machdep.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c stable/10/sys/arm/econa/timer.c stable/10/sys/arm/freescale/imx/imx51_ipuv3.c stable/10/sys/arm/freescale/imx/imx_gpt.c stable/10/sys/arm/freescale/imx/imx_machdep.c stable/10/sys/arm/include/cpu.h stable/10/sys/arm/include/fdt.h stable/10/sys/arm/include/frame.h stable/10/sys/arm/include/pcb.h stable/10/sys/arm/include/pcpu.h stable/10/sys/arm/include/undefined.h stable/10/sys/arm/lpc/lpc_fb.c stable/10/sys/arm/lpc/lpc_gpio.c stable/10/sys/arm/lpc/lpc_machdep.c stable/10/sys/arm/lpc/lpc_mmc.c stable/10/sys/arm/lpc/lpc_spi.c stable/10/sys/arm/lpc/lpc_timer.c stable/10/sys/arm/mv/mv_machdep.c stable/10/sys/arm/mv/mvvar.h stable/10/sys/arm/mv/orion/db88f5xxx.c stable/10/sys/arm/mv/timer.c stable/10/sys/arm/rockchip/rk30xx_gpio.c stable/10/sys/arm/rockchip/rk30xx_grf.c stable/10/sys/arm/rockchip/rk30xx_machdep.c stable/10/sys/arm/rockchip/rk30xx_pmu.c stable/10/sys/arm/sa11x0/sa11x0_io.c stable/10/sys/arm/samsung/exynos/arch_timer.c stable/10/sys/arm/samsung/exynos/exynos5_machdep.c stable/10/sys/arm/tegra/tegra2_machdep.c stable/10/sys/arm/ti/am335x/am335x_dmtimer.c stable/10/sys/arm/ti/am335x/am335x_lcd_syscons.c stable/10/sys/arm/ti/am335x/am335x_prcm.c stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c stable/10/sys/arm/ti/omap4/pandaboard/pandaboard.c stable/10/sys/arm/ti/ti_cpuid.c stable/10/sys/arm/ti/ti_machdep.c stable/10/sys/arm/ti/ti_mmchs.c stable/10/sys/arm/ti/ti_prcm.c stable/10/sys/arm/ti/ti_scm.c stable/10/sys/arm/ti/twl/twl.c stable/10/sys/arm/ti/twl/twl_clks.c stable/10/sys/arm/ti/twl/twl_vreg.c stable/10/sys/arm/versatile/pl050.c stable/10/sys/arm/versatile/sp804.c stable/10/sys/arm/versatile/versatile_clcd.c stable/10/sys/arm/versatile/versatile_machdep.c stable/10/sys/arm/versatile/versatile_pci.c stable/10/sys/arm/versatile/versatile_timer.c stable/10/sys/arm/xilinx/zy7_machdep.c stable/10/sys/arm/xscale/i80321/i80321_pci.c stable/10/sys/arm/xscale/i8134x/i81342_pci.c stable/10/sys/arm/xscale/ixp425/ixp425_pci.c stable/10/sys/arm/xscale/ixp425/ixp425_wdog.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/allwinner/a10_clk.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_clk.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/allwinner/a10_clk.c Fri Dec 13 20:43:11 2013 (r259329) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/allwinner/a10_gpio.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_gpio.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/allwinner/a10_gpio.c Fri Dec 13 20:43:11 2013 (r259329) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/allwinner/a10_machdep.c ============================================================================== --- stable/10/sys/arm/allwinner/a10_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/allwinner/a10_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -43,9 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c ============================================================================== --- stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/allwinner/a20/a20_cpu_cfg.c Fri Dec 13 20:43:11 2013 (r259329) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/allwinner/timer.c ============================================================================== --- stable/10/sys/arm/allwinner/timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/allwinner/timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/arm/cpufunc.c ============================================================================== --- stable/10/sys/arm/arm/cpufunc.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/cpufunc.c Fri Dec 13 20:43:11 2013 (r259329) @@ -1720,7 +1720,7 @@ int early_abort_fixup(arg) void *arg; { - trapframe_t *frame = arg; + struct trapframe *frame = arg; u_int fault_pc; u_int fault_instruction; int saved_lr = 0; @@ -1861,7 +1861,7 @@ int late_abort_fixup(arg) void *arg; { - trapframe_t *frame = arg; + struct trapframe *frame = arg; u_int fault_pc; u_int fault_instruction; int saved_lr = 0; Modified: stable/10/sys/arm/arm/genassym.c ============================================================================== --- stable/10/sys/arm/arm/genassym.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/genassym.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: stable/10/sys/arm/arm/generic_timer.c ============================================================================== --- stable/10/sys/arm/arm/generic_timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/generic_timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/arm/machdep.c ============================================================================== --- stable/10/sys/arm/arm/machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -90,11 +90,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include -#include #include #include #include Modified: stable/10/sys/arm/arm/minidump_machdep.c ============================================================================== --- stable/10/sys/arm/arm/minidump_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/minidump_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #endif #include #include -#include #include #include #include Modified: stable/10/sys/arm/arm/mpcore_timer.c ============================================================================== --- stable/10/sys/arm/arm/mpcore_timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/mpcore_timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/arm/nexus.c ============================================================================== --- stable/10/sys/arm/arm/nexus.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/nexus.c Fri Dec 13 20:43:11 2013 (r259329) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/arm/trap.c ============================================================================== --- stable/10/sys/arm/arm/trap.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/trap.c Fri Dec 13 20:43:11 2013 (r259329) @@ -123,8 +123,8 @@ __FBSDID("$FreeBSD$"); #endif -void swi_handler(trapframe_t *); -void undefinedinstruction(trapframe_t *); +void swi_handler(struct trapframe *); +void undefinedinstruction(struct trapframe *); #include #include @@ -145,13 +145,17 @@ struct ksig { u_long code; }; struct data_abort { - int (*func)(trapframe_t *, u_int, u_int, struct thread *, struct ksig *); + int (*func)(struct trapframe *, u_int, u_int, struct thread *, + struct ksig *); const char *desc; }; -static int dab_fatal(trapframe_t *, u_int, u_int, struct thread *, struct ksig *); -static int dab_align(trapframe_t *, u_int, u_int, struct thread *, struct ksig *); -static int dab_buserr(trapframe_t *, u_int, u_int, struct thread *, struct ksig *); +static int dab_fatal(struct trapframe *, u_int, u_int, struct thread *, + struct ksig *); +static int dab_align(struct trapframe *, u_int, u_int, struct thread *, + struct ksig *); +static int dab_buserr(struct trapframe *, u_int, u_int, struct thread *, + struct ksig *); static const struct data_abort data_aborts[] = { {dab_fatal, "Vector Exception"}, @@ -196,7 +200,8 @@ call_trapsignal(struct thread *td, int s } static __inline int -data_abort_fixup(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig) +data_abort_fixup(struct trapframe *tf, u_int fsr, u_int far, struct thread *td, + struct ksig *ksig) { #ifdef CPU_ABORT_FIXUP_REQUIRED int error; @@ -226,7 +231,7 @@ data_abort_fixup(trapframe_t *tf, u_int } void -data_abort_handler(trapframe_t *tf) +data_abort_handler(struct trapframe *tf) { struct vm_map *map; struct pcb *pcb; @@ -482,7 +487,8 @@ out: * Note: If 'l' is NULL, we assume we're dealing with a prefetch abort. */ static int -dab_fatal(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig) +dab_fatal(struct trapframe *tf, u_int fsr, u_int far, struct thread *td, + struct ksig *ksig) { const char *mode; @@ -538,7 +544,8 @@ dab_fatal(trapframe_t *tf, u_int fsr, u_ * deliver a bus error to the process. */ static int -dab_align(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig) +dab_align(struct trapframe *tf, u_int fsr, u_int far, struct thread *td, + struct ksig *ksig) { /* Alignment faults are always fatal if they occur in kernel mode */ @@ -586,7 +593,8 @@ dab_align(trapframe_t *tf, u_int fsr, u_ * In all other cases, these data aborts are considered fatal. */ static int -dab_buserr(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig) +dab_buserr(struct trapframe *tf, u_int fsr, u_int far, struct thread *td, + struct ksig *ksig) { struct pcb *pcb = td->td_pcb; @@ -607,7 +615,7 @@ dab_buserr(trapframe_t *tf, u_int fsr, u * If the current trapframe is at the top of the kernel stack, * the fault _must_ have come from user mode. */ - if (tf != ((trapframe_t *)pcb->un_32.pcb32_sp) - 1) { + if (tf != ((struct trapframe *)pcb->un_32.pcb32_sp) - 1) { /* * Kernel mode. We're either about to die a * spectacular death, or pcb_onfault will come @@ -660,7 +668,7 @@ dab_buserr(trapframe_t *tf, u_int fsr, u } static __inline int -prefetch_abort_fixup(trapframe_t *tf, struct ksig *ksig) +prefetch_abort_fixup(struct trapframe *tf, struct ksig *ksig) { #ifdef CPU_ABORT_FIXUP_REQUIRED int error; @@ -691,7 +699,7 @@ prefetch_abort_fixup(trapframe_t *tf, st } /* - * void prefetch_abort_handler(trapframe_t *tf) + * void prefetch_abort_handler(struct trapframe *tf) * * Abort handler called when instruction execution occurs at * a non existent or restricted (access permissions) memory page. @@ -702,7 +710,7 @@ prefetch_abort_fixup(trapframe_t *tf, st * Otherwise fault the page in and try again. */ void -prefetch_abort_handler(trapframe_t *tf) +prefetch_abort_handler(struct trapframe *tf) { struct thread *td; struct proc * p; @@ -907,7 +915,7 @@ cpu_fetch_syscall_args(struct thread *td #include "../../kern/subr_syscall.c" static void -syscall(struct thread *td, trapframe_t *frame) +syscall(struct thread *td, struct trapframe *frame) { struct syscall_args sa; int error; @@ -932,7 +940,7 @@ syscall(struct thread *td, trapframe_t * } void -swi_handler(trapframe_t *frame) +swi_handler(struct trapframe *frame) { struct thread *td = curthread; Modified: stable/10/sys/arm/arm/undefined.c ============================================================================== --- stable/10/sys/arm/arm/undefined.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/undefined.c Fri Dec 13 20:43:11 2013 (r259329) @@ -166,7 +166,7 @@ undefined_init() void -undefinedinstruction(trapframe_t *frame) +undefinedinstruction(struct trapframe *frame) { struct thread *td; u_int fault_pc; Modified: stable/10/sys/arm/arm/vfp.c ============================================================================== --- stable/10/sys/arm/arm/vfp.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/vfp.c Fri Dec 13 20:43:11 2013 (r259329) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include Modified: stable/10/sys/arm/arm/vm_machdep.c ============================================================================== --- stable/10/sys/arm/arm/vm_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/arm/vm_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -294,7 +295,7 @@ done: void cpu_set_syscall_retval(struct thread *td, int error) { - trapframe_t *frame; + struct trapframe *frame; int fixup; #ifdef __ARMEB__ uint32_t insn; Modified: stable/10/sys/arm/at91/at91_mci.c ============================================================================== --- stable/10/sys/arm/at91/at91_mci.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/at91/at91_mci.c Fri Dec 13 20:43:11 2013 (r259329) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/at91/at91_pmc.c ============================================================================== --- stable/10/sys/arm/at91/at91_pmc.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/at91/at91_pmc.c Fri Dec 13 20:43:11 2013 (r259329) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_dma.c Fri Dec 13 20:43:11 2013 (r259329) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "bcm2835_dma.h" #include "bcm2835_vcbus.h" Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_fb.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_fb.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_fb.c Fri Dec 13 20:43:11 2013 (r259329) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Fri Dec 13 20:43:11 2013 (r259329) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -52,9 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Fri Dec 13 20:43:11 2013 (r259329) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_spi.c Fri Dec 13 20:43:11 2013 (r259329) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_systimer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/econa/timer.c ============================================================================== --- stable/10/sys/arm/econa/timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/econa/timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "econa_reg.h" Modified: stable/10/sys/arm/freescale/imx/imx51_ipuv3.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_ipuv3.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/freescale/imx/imx51_ipuv3.c Fri Dec 13 20:43:11 2013 (r259329) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/freescale/imx/imx_gpt.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx_gpt.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/freescale/imx/imx_gpt.c Fri Dec 13 20:43:11 2013 (r259329) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/freescale/imx/imx_machdep.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/freescale/imx/imx_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,9 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include #include Modified: stable/10/sys/arm/include/cpu.h ============================================================================== --- stable/10/sys/arm/include/cpu.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/include/cpu.h Fri Dec 13 20:43:11 2013 (r259329) @@ -5,6 +5,7 @@ #define MACHINE_CPU_H #include +#include void cpu_halt(void); void swi_vm(void *); Modified: stable/10/sys/arm/include/fdt.h ============================================================================== --- stable/10/sys/arm/include/fdt.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/include/fdt.h Fri Dec 13 20:43:11 2013 (r259329) @@ -38,7 +38,6 @@ #include #include -#include #include /* Max interrupt number */ Modified: stable/10/sys/arm/include/frame.h ============================================================================== --- stable/10/sys/arm/include/frame.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/include/frame.h Fri Dec 13 20:43:11 2013 (r259329) @@ -59,7 +59,7 @@ * Trap frame. Pushed onto the kernel stack on a trap (synchronous exception). */ -typedef struct trapframe { +struct trapframe { register_t tf_spsr; /* Zero on arm26 */ register_t tf_r0; register_t tf_r1; @@ -80,7 +80,7 @@ typedef struct trapframe { register_t tf_svc_lr; /* Not used on arm26 */ register_t tf_pc; register_t tf_pad; -} trapframe_t; +}; /* Register numbers */ #define tf_r13 tf_usr_sp Modified: stable/10/sys/arm/include/pcb.h ============================================================================== --- stable/10/sys/arm/include/pcb.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/include/pcb.h Fri Dec 13 20:43:11 2013 (r259329) @@ -38,7 +38,6 @@ #ifndef _MACHINE_PCB_H_ #define _MACHINE_PCB_H_ -#include #include Modified: stable/10/sys/arm/include/pcpu.h ============================================================================== --- stable/10/sys/arm/include/pcpu.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/include/pcpu.h Fri Dec 13 20:43:11 2013 (r259329) @@ -33,7 +33,6 @@ #ifdef _KERNEL #include -#include #define ALT_STACK_SIZE 128 Modified: stable/10/sys/arm/include/undefined.h ============================================================================== --- stable/10/sys/arm/include/undefined.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/include/undefined.h Fri Dec 13 20:43:11 2013 (r259329) @@ -52,7 +52,9 @@ #include -typedef int (*undef_handler_t) (unsigned int, unsigned int, trapframe_t *, int); +struct trapframe; + +typedef int (*undef_handler_t) (unsigned int, unsigned int, struct trapframe *, int); #define FP_COPROC 1 #define FP_COPROC2 2 Modified: stable/10/sys/arm/lpc/lpc_fb.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_fb.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/lpc/lpc_fb.c Fri Dec 13 20:43:11 2013 (r259329) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/lpc/lpc_gpio.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_gpio.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/lpc/lpc_gpio.c Fri Dec 13 20:43:11 2013 (r259329) @@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/lpc/lpc_machdep.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/lpc/lpc_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -50,9 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include #include Modified: stable/10/sys/arm/lpc/lpc_mmc.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_mmc.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/lpc/lpc_mmc.c Fri Dec 13 20:43:11 2013 (r259329) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/lpc/lpc_spi.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_spi.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/lpc/lpc_spi.c Fri Dec 13 20:43:11 2013 (r259329) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/lpc/lpc_timer.c ============================================================================== --- stable/10/sys/arm/lpc/lpc_timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/lpc/lpc_timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/mv/mv_machdep.c ============================================================================== --- stable/10/sys/arm/mv/mv_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/mv/mv_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -50,9 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include /* XXX */ #include /* XXX eventually this should be eliminated */ Modified: stable/10/sys/arm/mv/mvvar.h ============================================================================== --- stable/10/sys/arm/mv/mvvar.h Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/mv/mvvar.h Fri Dec 13 20:43:11 2013 (r259329) @@ -44,7 +44,6 @@ #include #include #include -#include #include #define MV_TYPE_PCI 0 Modified: stable/10/sys/arm/mv/orion/db88f5xxx.c ============================================================================== --- stable/10/sys/arm/mv/orion/db88f5xxx.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/mv/orion/db88f5xxx.c Fri Dec 13 20:43:11 2013 (r259329) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/mv/timer.c ============================================================================== --- stable/10/sys/arm/mv/timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/mv/timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/rockchip/rk30xx_gpio.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_gpio.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/rockchip/rk30xx_gpio.c Fri Dec 13 20:43:11 2013 (r259329) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/rockchip/rk30xx_grf.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_grf.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/rockchip/rk30xx_grf.c Fri Dec 13 20:43:11 2013 (r259329) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/rockchip/rk30xx_machdep.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/rockchip/rk30xx_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -44,9 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/rockchip/rk30xx_pmu.c ============================================================================== --- stable/10/sys/arm/rockchip/rk30xx_pmu.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/rockchip/rk30xx_pmu.c Fri Dec 13 20:43:11 2013 (r259329) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/sa11x0/sa11x0_io.c ============================================================================== --- stable/10/sys/arm/sa11x0/sa11x0_io.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/sa11x0/sa11x0_io.c Fri Dec 13 20:43:11 2013 (r259329) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* Proto types for all the bus_space structure functions */ Modified: stable/10/sys/arm/samsung/exynos/arch_timer.c ============================================================================== --- stable/10/sys/arm/samsung/exynos/arch_timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/samsung/exynos/arch_timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/samsung/exynos/exynos5_machdep.c ============================================================================== --- stable/10/sys/arm/samsung/exynos/exynos5_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/samsung/exynos/exynos5_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,9 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/tegra/tegra2_machdep.c ============================================================================== --- stable/10/sys/arm/tegra/tegra2_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/tegra/tegra2_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -45,9 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/ti/am335x/am335x_dmtimer.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_dmtimer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/am335x/am335x_dmtimer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/am335x/am335x_lcd_syscons.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_lcd_syscons.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/am335x/am335x_lcd_syscons.c Fri Dec 13 20:43:11 2013 (r259329) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/am335x/am335x_prcm.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_prcm.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/am335x/am335x_prcm.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c ============================================================================== --- stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c Fri Dec 13 20:43:11 2013 (r259329) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c ============================================================================== --- stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/omap4/omap4_prcm_clks.c Fri Dec 13 20:43:11 2013 (r259329) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c ============================================================================== --- stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c Fri Dec 13 20:43:11 2013 (r259329) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: stable/10/sys/arm/ti/omap4/pandaboard/pandaboard.c ============================================================================== --- stable/10/sys/arm/ti/omap4/pandaboard/pandaboard.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/omap4/pandaboard/pandaboard.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: stable/10/sys/arm/ti/ti_cpuid.c ============================================================================== --- stable/10/sys/arm/ti/ti_cpuid.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/ti_cpuid.c Fri Dec 13 20:43:11 2013 (r259329) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/ti_machdep.c ============================================================================== --- stable/10/sys/arm/ti/ti_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/ti_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/ti/ti_mmchs.c ============================================================================== --- stable/10/sys/arm/ti/ti_mmchs.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/ti_mmchs.c Fri Dec 13 20:43:11 2013 (r259329) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/ti_prcm.c ============================================================================== --- stable/10/sys/arm/ti/ti_prcm.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/ti_prcm.c Fri Dec 13 20:43:11 2013 (r259329) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/ti_scm.c ============================================================================== --- stable/10/sys/arm/ti/ti_scm.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/ti_scm.c Fri Dec 13 20:43:11 2013 (r259329) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/twl/twl.c ============================================================================== --- stable/10/sys/arm/ti/twl/twl.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/twl/twl.c Fri Dec 13 20:43:11 2013 (r259329) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/twl/twl_clks.c ============================================================================== --- stable/10/sys/arm/ti/twl/twl_clks.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/twl/twl_clks.c Fri Dec 13 20:43:11 2013 (r259329) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- stable/10/sys/arm/ti/twl/twl_vreg.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/ti/twl/twl_vreg.c Fri Dec 13 20:43:11 2013 (r259329) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/versatile/pl050.c ============================================================================== --- stable/10/sys/arm/versatile/pl050.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/versatile/pl050.c Fri Dec 13 20:43:11 2013 (r259329) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: stable/10/sys/arm/versatile/sp804.c ============================================================================== --- stable/10/sys/arm/versatile/sp804.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/versatile/sp804.c Fri Dec 13 20:43:11 2013 (r259329) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/versatile/versatile_clcd.c ============================================================================== --- stable/10/sys/arm/versatile/versatile_clcd.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/versatile/versatile_clcd.c Fri Dec 13 20:43:11 2013 (r259329) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: stable/10/sys/arm/versatile/versatile_machdep.c ============================================================================== --- stable/10/sys/arm/versatile/versatile_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/versatile/versatile_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* For trapframe_t, used in */ #include -#include #include Modified: stable/10/sys/arm/versatile/versatile_pci.c ============================================================================== --- stable/10/sys/arm/versatile/versatile_pci.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/versatile/versatile_pci.c Fri Dec 13 20:43:11 2013 (r259329) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/versatile/versatile_timer.c ============================================================================== --- stable/10/sys/arm/versatile/versatile_timer.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/versatile/versatile_timer.c Fri Dec 13 20:43:11 2013 (r259329) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/xilinx/zy7_machdep.c ============================================================================== --- stable/10/sys/arm/xilinx/zy7_machdep.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/xilinx/zy7_machdep.c Fri Dec 13 20:43:11 2013 (r259329) @@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include Modified: stable/10/sys/arm/xscale/i80321/i80321_pci.c ============================================================================== --- stable/10/sys/arm/xscale/i80321/i80321_pci.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/xscale/i80321/i80321_pci.c Fri Dec 13 20:43:11 2013 (r259329) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/xscale/i8134x/i81342_pci.c ============================================================================== --- stable/10/sys/arm/xscale/i8134x/i81342_pci.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/xscale/i8134x/i81342_pci.c Fri Dec 13 20:43:11 2013 (r259329) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/xscale/ixp425/ixp425_pci.c ============================================================================== --- stable/10/sys/arm/xscale/ixp425/ixp425_pci.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/xscale/ixp425/ixp425_pci.c Fri Dec 13 20:43:11 2013 (r259329) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: stable/10/sys/arm/xscale/ixp425/ixp425_wdog.c ============================================================================== --- stable/10/sys/arm/xscale/ixp425/ixp425_wdog.c Fri Dec 13 20:33:59 2013 (r259328) +++ stable/10/sys/arm/xscale/ixp425/ixp425_wdog.c Fri Dec 13 20:43:11 2013 (r259329) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include