diff options
Diffstat (limited to 'sys')
133 files changed, 159 insertions, 359 deletions
diff --git a/sys/arch/alpha/alpha/dec_kn300.c b/sys/arch/alpha/alpha/dec_kn300.c index 2c4f3b8c811..edb0a1031bf 100644 --- a/sys/arch/alpha/alpha/dec_kn300.c +++ b/sys/arch/alpha/alpha/dec_kn300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_kn300.c,v 1.6 2010/11/23 04:07:55 shadchin Exp $ */ +/* $OpenBSD: dec_kn300.c,v 1.7 2012/12/05 23:20:09 deraadt Exp $ */ /* $NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $ */ /* @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/alpha/include/sysarch.h b/sys/arch/alpha/include/sysarch.h index 73a098ea64c..b118a1c2dc9 100644 --- a/sys/arch/alpha/include/sysarch.h +++ b/sys/arch/alpha/include/sysarch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysarch.h,v 1.8 2012/10/10 11:23:47 sthen Exp $ */ +/* $OpenBSD: sysarch.h,v 1.9 2012/12/05 23:20:09 deraadt Exp $ */ /* $NetBSD: sysarch.h,v 1.8 2001/04/26 03:10:46 ross Exp $ */ /*- @@ -33,7 +33,6 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#include <sys/cdefs.h> #include <machine/ieeefp.h> /* @@ -56,6 +55,9 @@ struct alpha_fp_c_args { }; #ifndef _KERNEL + +#include <sys/cdefs.h> + __BEGIN_DECLS int sysarch(int, void *); __END_DECLS diff --git a/sys/arch/alpha/mcbus/mcbus.c b/sys/arch/alpha/mcbus/mcbus.c index 30e050bd5ac..3fbf2d70870 100644 --- a/sys/arch/alpha/mcbus/mcbus.c +++ b/sys/arch/alpha/mcbus/mcbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcbus.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */ +/* $OpenBSD: mcbus.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcbus.c,v 1.19 2007/03/04 05:59:11 christos Exp $ */ /* @@ -36,7 +36,6 @@ * bus found on AlphaServer 4100 systems. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/alpha/mcbus/mcmem.c b/sys/arch/alpha/mcbus/mcmem.c index 48f2aaea474..e736d3d0549 100644 --- a/sys/arch/alpha/mcbus/mcmem.c +++ b/sys/arch/alpha/mcbus/mcmem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcmem.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */ +/* $OpenBSD: mcmem.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcmem.c,v 1.4 2002/10/02 04:06:38 thorpej Exp $ */ /* @@ -37,7 +37,6 @@ * the MCBUS main system bus found on AlphaServer 4100 systems. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/alpha/pci/mcpcia.c b/sys/arch/alpha/pci/mcpcia.c index 9d519c67437..d0326ae347d 100644 --- a/sys/arch/alpha/pci/mcpcia.c +++ b/sys/arch/alpha/pci/mcpcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcpcia.c,v 1.5 2010/02/18 20:48:15 sobrado Exp $ */ +/* $OpenBSD: mcpcia.c,v 1.6 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcpcia.c,v 1.20 2007/03/04 05:59:11 christos Exp $ */ /*- @@ -66,7 +66,6 @@ * found on AlphaServer 4100 systems. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/alpha/pci/mcpcia_bus_io.c b/sys/arch/alpha/pci/mcpcia_bus_io.c index aa39c1bbada..86f087e414a 100644 --- a/sys/arch/alpha/pci/mcpcia_bus_io.c +++ b/sys/arch/alpha/pci/mcpcia_bus_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcpcia_bus_io.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */ +/* $OpenBSD: mcpcia_bus_io.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcpcia_bus_io.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */ /* @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/alpha/pci/mcpcia_bus_mem.c b/sys/arch/alpha/pci/mcpcia_bus_mem.c index b684e4241a4..f1cef61c997 100644 --- a/sys/arch/alpha/pci/mcpcia_bus_mem.c +++ b/sys/arch/alpha/pci/mcpcia_bus_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcpcia_bus_mem.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */ +/* $OpenBSD: mcpcia_bus_mem.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcpcia_bus_mem.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */ /* @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/alpha/pci/mcpcia_dma.c b/sys/arch/alpha/pci/mcpcia_dma.c index 14bdc5c83f2..7dba6aa8823 100644 --- a/sys/arch/alpha/pci/mcpcia_dma.c +++ b/sys/arch/alpha/pci/mcpcia_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcpcia_dma.c,v 1.3 2009/02/01 14:34:00 miod Exp $ */ +/* $OpenBSD: mcpcia_dma.c,v 1.4 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcpcia_dma.c,v 1.15 2001/07/19 18:55:40 thorpej Exp $ */ /*- @@ -33,7 +33,6 @@ #define _ALPHA_BUS_DMA_PRIVATE -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/arch/alpha/pci/mcpcia_pci.c b/sys/arch/alpha/pci/mcpcia_pci.c index ddc9e00b76c..43e16b417c7 100644 --- a/sys/arch/alpha/pci/mcpcia_pci.c +++ b/sys/arch/alpha/pci/mcpcia_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcpcia_pci.c,v 1.2 2010/12/04 17:06:31 miod Exp $ */ +/* $OpenBSD: mcpcia_pci.c,v 1.3 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: mcpcia_pci.c,v 1.5 2007/03/04 05:59:11 christos Exp $ */ /* @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c index 76f8b844482..2af6cceeb4e 100644 --- a/sys/arch/alpha/pci/pci_kn300.c +++ b/sys/arch/alpha/pci/pci_kn300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_kn300.c,v 1.4 2009/09/30 20:18:06 miod Exp $ */ +/* $OpenBSD: pci_kn300.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: pci_kn300.c,v 1.28 2005/12/11 12:16:17 christos Exp $ */ /* @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/types.h> #include <sys/param.h> #include <sys/time.h> diff --git a/sys/arch/alpha/pci/pciide_machdep.c b/sys/arch/alpha/pci/pciide_machdep.c index 9ab736eea7d..a4be37bf168 100644 --- a/sys/arch/alpha/pci/pciide_machdep.c +++ b/sys/arch/alpha/pci/pciide_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_machdep.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pciide_machdep.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: pciide_machdep.c,v 1.2 1998/04/18 01:09:20 thorpej Exp $ */ /* @@ -41,8 +41,6 @@ * PCI SIG. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/amd64/amd64/bus_dma.c b/sys/arch/amd64/amd64/bus_dma.c index d6f073eeecd..5c7fc241b49 100644 --- a/sys/arch/amd64/amd64/bus_dma.c +++ b/sys/arch/amd64/amd64/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.38 2011/07/03 18:31:02 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.39 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: bus_dma.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -31,8 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - /* * The following is included because _bus_dma_uiomove is derived from * uiomove() in kern_subr.c. diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c index 41f334d0c79..a49d7828b58 100644 --- a/sys/arch/amd64/amd64/intr.c +++ b/sys/arch/amd64/amd64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.31 2011/10/29 19:17:30 kettenis Exp $ */ +/* $OpenBSD: intr.c,v 1.32 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */ /* @@ -38,7 +38,6 @@ /* #define INTRDEBUG */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/arch/amd64/amd64/ipi.c b/sys/arch/amd64/amd64/ipi.c index f6ca47c87f6..6f568411e08 100644 --- a/sys/arch/amd64/amd64/ipi.c +++ b/sys/arch/amd64/amd64/ipi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipi.c,v 1.10 2010/12/27 20:22:23 guenther Exp $ */ +/* $OpenBSD: ipi.c,v 1.11 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: ipi.c,v 1.2 2003/03/01 13:05:37 fvdl Exp $ */ /*- @@ -32,8 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - #include <sys/param.h> #include <sys/device.h> #include <sys/systm.h> diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c index caec5b0b428..ffeb7c71e3f 100644 --- a/sys/arch/amd64/amd64/ipifuncs.c +++ b/sys/arch/amd64/amd64/ipifuncs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipifuncs.c,v 1.16 2011/03/18 03:10:47 guenther Exp $ */ +/* $OpenBSD: ipifuncs.c,v 1.17 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: ipifuncs.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -32,8 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - /* * Interprocessor interrupt handlers. */ diff --git a/sys/arch/amd64/include/cpufunc.h b/sys/arch/amd64/include/cpufunc.h index 1373e1712df..22a801393a0 100644 --- a/sys/arch/amd64/include/cpufunc.h +++ b/sys/arch/amd64/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.8 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: cpufunc.h,v 1.3 2003/05/08 10:27:43 fvdl Exp $ */ /*- @@ -37,7 +37,6 @@ * Functions to provide access to i386-specific instructions. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <machine/specialreg.h> diff --git a/sys/arch/amd64/include/sysarch.h b/sys/arch/amd64/include/sysarch.h index bebba9b3579..185a0837af9 100644 --- a/sys/arch/amd64/include/sysarch.h +++ b/sys/arch/amd64/include/sysarch.h @@ -1,11 +1,9 @@ -/* $OpenBSD: sysarch.h,v 1.11 2012/10/10 11:23:47 sthen Exp $ */ +/* $OpenBSD: sysarch.h,v 1.12 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: sysarch.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $ */ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#include <sys/cdefs.h> - /* * Architecture specific syscalls (amd64) */ @@ -70,6 +68,9 @@ int amd64_iopl(struct proc *, void *, register_t *); int amd64_set_fsbase(struct proc *, void *); int amd64_get_fsbase(struct proc *, void *); #else + +#include <sys/cdefs.h> + __BEGIN_DECLS int amd64_iopl(int); int amd64_get_ioperm(u_long *); diff --git a/sys/arch/amd64/pci/vga_post.c b/sys/arch/amd64/pci/vga_post.c index 36c4d82d1dd..e4ab05158ba 100644 --- a/sys/arch/amd64/pci/vga_post.c +++ b/sys/arch/amd64/pci/vga_post.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_post.c,v 1.4 2009/06/14 20:27:24 miod Exp $ */ +/* $OpenBSD: vga_post.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */ /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */ /*- @@ -30,8 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/arch/arm/arm/fiq.c b/sys/arch/arm/arm/fiq.c index 6bf734c501f..60bb686d35d 100644 --- a/sys/arch/arm/arm/fiq.c +++ b/sys/arch/arm/arm/fiq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fiq.c,v 1.2 2011/09/20 22:02:11 miod Exp $ */ +/* $OpenBSD: fiq.c,v 1.3 2012/12/05 23:20:11 deraadt Exp $ */ /* $NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $ */ /* @@ -36,8 +36,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c index 690f89b3391..7478196a017 100644 --- a/sys/arch/arm/arm/pmap.c +++ b/sys/arch/arm/arm/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.37 2012/04/19 14:21:01 deraadt Exp $ */ +/* $OpenBSD: pmap.c,v 1.38 2012/12/05 23:20:11 deraadt Exp $ */ /* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */ /* @@ -190,7 +190,6 @@ #include <sys/malloc.h> #include <sys/user.h> #include <sys/pool.h> -#include <sys/cdefs.h> #include <sys/sched.h> #include <uvm/uvm.h> diff --git a/sys/arch/arm/armv7/armv7_a4x_space.c b/sys/arch/arm/armv7/armv7_a4x_space.c index 3fea5a3129e..845f7704d8d 100644 --- a/sys/arch/arm/armv7/armv7_a4x_space.c +++ b/sys/arch/arm/armv7/armv7_a4x_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_a4x_space.c,v 1.1 2009/05/08 02:57:32 drahn Exp $ */ +/* $OpenBSD: armv7_a4x_space.c,v 1.2 2012/12/05 23:20:11 deraadt Exp $ */ /* $NetBSD: armv7_a4x_space.c,v 1.2 2003/07/15 00:24:54 lukem Exp $ */ /* @@ -39,8 +39,6 @@ * all registers are located at the address of multiple of 4. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/arm/armv7/armv7_space.c b/sys/arch/arm/armv7/armv7_space.c index 97fb452e7c0..df0aede80e1 100644 --- a/sys/arch/arm/armv7/armv7_space.c +++ b/sys/arch/arm/armv7/armv7_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_space.c,v 1.1 2009/05/08 02:57:32 drahn Exp $ */ +/* $OpenBSD: armv7_space.c,v 1.2 2012/12/05 23:20:11 deraadt Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -75,11 +75,6 @@ * Derived from i80321_space.c. */ -#include <sys/cdefs.h> -/* -__KERNEL_RCSID(0, "$NetBSD: armv7_space.c,v 1.5 2004/06/07 19:45:22 nathanw Exp $"); -*/ - #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/arm/include/sysarch.h b/sys/arch/arm/include/sysarch.h index 155006b6333..946db39ab29 100644 --- a/sys/arch/arm/include/sysarch.h +++ b/sys/arch/arm/include/sysarch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysarch.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ +/* $OpenBSD: sysarch.h,v 1.3 2012/12/05 23:20:11 deraadt Exp $ */ /* $NetBSD: sysarch.h,v 1.4 2002/03/30 06:23:39 thorpej Exp $ */ /* @@ -36,8 +36,6 @@ #ifndef _ARM_SYSARCH_H_ #define _ARM_SYSARCH_H_ -#include <sys/cdefs.h> - /* * Architecture specific syscalls (arm) */ @@ -51,6 +49,9 @@ struct arm_sync_icache_args { }; #ifndef _KERNEL + +#include <sys/cdefs.h> + __BEGIN_DECLS int arm_sync_icache (u_int addr, int len); int arm_drain_writebuf (void); diff --git a/sys/arch/arm/xscale/pxa2x0_dmac.c b/sys/arch/arm/xscale/pxa2x0_dmac.c index 2235d01b407..60bce8ac1ae 100644 --- a/sys/arch/arm/xscale/pxa2x0_dmac.c +++ b/sys/arch/arm/xscale/pxa2x0_dmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_dmac.c,v 1.3 2006/04/04 11:37:05 pascoe Exp $ */ +/* $OpenBSD: pxa2x0_dmac.c,v 1.4 2012/12/05 23:20:11 deraadt Exp $ */ /* * Copyright (c) 2005 Christopher Pascoe <pascoe@openbsd.org> @@ -19,7 +19,6 @@ /* * DMA Controller Handler for the Intel PXA2X0 processor. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/arm/xscale/pxa2x0_intr.c b/sys/arch/arm/xscale/pxa2x0_intr.c index 70d3d436d2b..e438498515c 100644 --- a/sys/arch/arm/xscale/pxa2x0_intr.c +++ b/sys/arch/arm/xscale/pxa2x0_intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_intr.c,v 1.22 2011/09/20 22:02:13 miod Exp $ */ +/* $OpenBSD: pxa2x0_intr.c,v 1.23 2012/12/05 23:20:11 deraadt Exp $ */ /* $NetBSD: pxa2x0_intr.c,v 1.5 2003/07/15 00:24:55 lukem Exp $ */ /* @@ -39,8 +39,6 @@ * It has integrated interrupt controller. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/beagle/dev/omap_com.c b/sys/arch/beagle/dev/omap_com.c index 0d1e4f8196c..b7524b9ea80 100644 --- a/sys/arch/beagle/dev/omap_com.c +++ b/sys/arch/beagle/dev/omap_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap_com.c,v 1.9 2011/11/10 19:37:01 uwe Exp $ */ +/* $OpenBSD: omap_com.c,v 1.10 2012/12/05 23:20:11 deraadt Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. * All rights reserved. @@ -34,8 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c index e7c99f9d591..a0d366477a3 100644 --- a/sys/arch/i386/i386/gdt.c +++ b/sys/arch/i386/i386/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.30 2010/06/26 23:24:43 guenther Exp $ */ +/* $OpenBSD: gdt.c,v 1.31 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: gdt.c,v 1.28 2002/12/14 09:38:50 junyoung Exp $ */ /*- @@ -47,8 +47,6 @@ * copy of the GDT as pointed to by the gdt variable. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c index e778070b83d..80ba35153cd 100644 --- a/sys/arch/i386/i386/ipifuncs.c +++ b/sys/arch/i386/i386/ipifuncs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipifuncs.c,v 1.19 2010/10/02 23:14:33 deraadt Exp $ */ +/* $OpenBSD: ipifuncs.c,v 1.20 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */ /*- @@ -32,8 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - /* * Interprocessor interrupt handlers. */ diff --git a/sys/arch/i386/i386/kvm86.c b/sys/arch/i386/i386/kvm86.c index c279e14e6c9..00c2330c02d 100644 --- a/sys/arch/i386/i386/kvm86.c +++ b/sys/arch/i386/i386/kvm86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm86.c,v 1.5 2010/06/27 13:28:46 miod Exp $ */ +/* $OpenBSD: kvm86.c,v 1.6 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: kvm86.c,v 1.10 2005/12/26 19:23:59 perry Exp $ */ /* * Copyright (c) 2002 @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/i386/i386/lock_machdep.c b/sys/arch/i386/i386/lock_machdep.c index c41675821f9..40b994b1d56 100644 --- a/sys/arch/i386/i386/lock_machdep.c +++ b/sys/arch/i386/i386/lock_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lock_machdep.c,v 1.10 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: lock_machdep.c,v 1.11 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: lock_machdep.c,v 1.1.2.3 2000/05/03 14:40:30 sommerfeld Exp $ */ /*- @@ -31,8 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - /* * Machine-dependent spin lock operations. */ diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h index fde5f80e289..7767fb4a9d9 100644 --- a/sys/arch/i386/include/cpufunc.h +++ b/sys/arch/i386/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.18 2011/03/23 16:54:35 pirofti Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.19 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $ */ /* @@ -40,7 +40,6 @@ * Functions to provide access to i386-specific instructions. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <machine/specialreg.h> diff --git a/sys/arch/i386/include/sysarch.h b/sys/arch/i386/include/sysarch.h index 763f27413b1..0cf97b86694 100644 --- a/sys/arch/i386/include/sysarch.h +++ b/sys/arch/i386/include/sysarch.h @@ -1,11 +1,9 @@ -/* $OpenBSD: sysarch.h,v 1.11 2012/10/10 11:23:47 sthen Exp $ */ +/* $OpenBSD: sysarch.h,v 1.12 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: sysarch.h,v 1.8 1996/01/08 13:51:44 mycroft Exp $ */ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#include <sys/cdefs.h> - /* * Architecture specific syscalls (i386) */ @@ -44,7 +42,13 @@ struct i386_set_ioperm_args { u_long *iomap; }; -#ifndef _KERNEL +#ifdef _KERNEL +uint32_t i386_get_threadbase(struct proc *, int); +int i386_set_threadbase(struct proc *, uint32_t, int); +#else + +#include <sys/cdefs.h> + __BEGIN_DECLS int i386_get_ldt(int, union descriptor *, int); int i386_set_ldt(int, union descriptor *, int); @@ -57,9 +61,6 @@ int i386_get_gsbase(void **); int i386_set_gsbase(void *); int sysarch(int, void *); __END_DECLS -#else -uint32_t i386_get_threadbase(struct proc *, int); -int i386_set_threadbase(struct proc *, uint32_t, int); #endif #endif /* !_MACHINE_SYSARCH_H_ */ diff --git a/sys/arch/i386/pci/geodesc.c b/sys/arch/i386/pci/geodesc.c index 3594aa313a6..b903ece0fc5 100644 --- a/sys/arch/i386/pci/geodesc.c +++ b/sys/arch/i386/pci/geodesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: geodesc.c,v 1.11 2012/10/17 22:32:01 deraadt Exp $ */ +/* $OpenBSD: geodesc.c,v 1.12 2012/12/05 23:20:12 deraadt Exp $ */ /* * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> @@ -21,7 +21,6 @@ * http://www.national.com/ds.cgi/SC/SC1100.pdf */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/i386/pci/glxsb.c b/sys/arch/i386/pci/glxsb.c index 241053e8a71..acb9b2af7e1 100644 --- a/sys/arch/i386/pci/glxsb.c +++ b/sys/arch/i386/pci/glxsb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glxsb.c,v 1.24 2012/01/13 09:53:24 mikeb Exp $ */ +/* $OpenBSD: glxsb.c,v 1.25 2012/12/05 23:20:12 deraadt Exp $ */ /* * Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org> @@ -23,7 +23,6 @@ * http://www.amd.com/files/connectivitysolutions/geode/geode_lx/33234d_lx_ds.pdf */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/arch/i386/pci/vga_post.c b/sys/arch/i386/pci/vga_post.c index be1b7c1deb9..fc3356c2f07 100644 --- a/sys/arch/i386/pci/vga_post.c +++ b/sys/arch/i386/pci/vga_post.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_post.c,v 1.4 2009/06/14 20:27:25 miod Exp $ */ +/* $OpenBSD: vga_post.c,v 1.5 2012/12/05 23:20:12 deraadt Exp $ */ /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */ /*- @@ -30,8 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/arch/ia64/include/setjmp.h b/sys/arch/ia64/include/setjmp.h index b05ba5dcfdf..80b7be56479 100644 --- a/sys/arch/ia64/include/setjmp.h +++ b/sys/arch/ia64/include/setjmp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.h,v 1.1 2011/07/04 23:29:08 pirofti Exp $ */ +/* $OpenBSD: setjmp.h,v 1.2 2012/12/05 23:20:13 deraadt Exp $ */ /* $NetBSD: setjmp.h,v 1.2 2006/09/10 21:16:56 cherry Exp $ */ /*- @@ -45,8 +45,6 @@ #ifndef _MACHINE_SETJMP_H_ #define _MACHINE_SETJMP_H_ -#include <sys/cdefs.h> - #define JMPBUF_ADDR_OF(buf, item) ((unsigned long)((char *)buf + item)) #define J_UNAT 0 diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c index e7941452123..7ce1699c3b2 100644 --- a/sys/arch/macppc/dev/esp.c +++ b/sys/arch/macppc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.7 2010/06/28 18:31:01 krw Exp $ */ +/* $OpenBSD: esp.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -69,8 +69,6 @@ * Charles Hannum (mycroft@duality.gnu.ai.mit.edu). Thanks a million! */ -#include <sys/cdefs.h> - #include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c index 1004f88673a..2093e3babeb 100644 --- a/sys/arch/macppc/dev/mediabay.c +++ b/sys/arch/macppc/dev/mediabay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mediabay.c,v 1.4 2010/04/09 17:01:30 jasper Exp $ */ +/* $OpenBSD: mediabay.c,v 1.5 2012/12/05 23:20:13 deraadt Exp $ */ /* $NetBSD: mediabay.c,v 1.9 2003/07/15 02:43:29 lukem Exp $ */ /*- @@ -27,8 +27,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/device.h> #include <sys/kernel.h> diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c index aecca24b0fc..4242bf40df4 100644 --- a/sys/arch/macppc/dev/pm_direct.c +++ b/sys/arch/macppc/dev/pm_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pm_direct.c,v 1.23 2011/05/14 12:01:16 mpi Exp $ */ +/* $OpenBSD: pm_direct.c,v 1.24 2012/12/05 23:20:13 deraadt Exp $ */ /* $NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $ */ /* @@ -40,7 +40,6 @@ /* #define PM_GRAB_SI 1 */ #include <sys/param.h> -#include <sys/cdefs.h> #include <sys/device.h> #include <sys/systm.h> diff --git a/sys/arch/macppc/stand/openfirm.h b/sys/arch/macppc/stand/openfirm.h index b374e8df782..bef8005210d 100644 --- a/sys/arch/macppc/stand/openfirm.h +++ b/sys/arch/macppc/stand/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.3 2002/03/14 03:15:56 millert Exp $ */ +/* $OpenBSD: openfirm.h,v 1.4 2012/12/05 23:20:13 deraadt Exp $ */ /* $NetBSD: openfirm.h,v 1.1 1997/04/16 20:29:23 thorpej Exp $ */ /* @@ -35,7 +35,6 @@ * Prototypes for Openfirmware Interface Routines */ -#include <sys/cdefs.h> #include <sys/types.h> int OF_finddevice(char *name); diff --git a/sys/arch/mips64/include/sysarch.h b/sys/arch/mips64/include/sysarch.h index 623d7191fca..5090c975c2f 100644 --- a/sys/arch/mips64/include/sysarch.h +++ b/sys/arch/mips64/include/sysarch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysarch.h,v 1.1 2009/09/27 18:20:13 miod Exp $ */ +/* $OpenBSD: sysarch.h,v 1.2 2012/12/05 23:20:13 deraadt Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -39,7 +39,9 @@ struct mips64_cacheflush_args { }; #ifndef _KERNEL + #include <sys/cdefs.h> + __BEGIN_DECLS int cacheflush(void *, int, int); int _flush_cache(char *, int, int); diff --git a/sys/arch/mvme68k/stand/sboot/clock.c b/sys/arch/mvme68k/stand/sboot/clock.c index 779c80843a1..3ce004677d0 100644 --- a/sys/arch/mvme68k/stand/sboot/clock.c +++ b/sys/arch/mvme68k/stand/sboot/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.7 2003/08/19 10:22:30 deraadt Exp $ */ +/* $OpenBSD: clock.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -46,7 +46,6 @@ * Clock driver. */ -#include <sys/cdefs.h> #include <sys/types.h> #include "sboot.h" #include "clockreg.h" diff --git a/sys/arch/mvme68k/stand/sboot/etherfun.c b/sys/arch/mvme68k/stand/sboot/etherfun.c index 3621b5e3071..1857f1e245d 100644 --- a/sys/arch/mvme68k/stand/sboot/etherfun.c +++ b/sys/arch/mvme68k/stand/sboot/etherfun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: etherfun.c,v 1.7 2012/11/04 13:36:47 miod Exp $ */ +/* $OpenBSD: etherfun.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */ /* * @@ -33,7 +33,7 @@ */ /* etherfun.c */ -#include <sys/cdefs.h> +#include <sys/types.h> #include <stand.h> #include "sboot.h" #include "etherfun.h" diff --git a/sys/arch/mvme68k/stand/sboot/if_le.c b/sys/arch/mvme68k/stand/sboot/if_le.c index 690cff92715..6ec1e04063a 100644 --- a/sys/arch/mvme68k/stand/sboot/if_le.c +++ b/sys/arch/mvme68k/stand/sboot/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.7 2003/08/19 10:22:30 deraadt Exp $ */ +/* $OpenBSD: if_le.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -54,7 +54,7 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#include <sys/types.h> #include <stand.h> #include "sboot.h" #include "if_lereg.h" diff --git a/sys/arch/mvme68k/stand/sboot/sboot.c b/sys/arch/mvme68k/stand/sboot/sboot.c index 8817b69e8ff..7ee1d6e7bc6 100644 --- a/sys/arch/mvme68k/stand/sboot/sboot.c +++ b/sys/arch/mvme68k/stand/sboot/sboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.c,v 1.10 2012/11/04 13:36:47 miod Exp $ */ +/* $OpenBSD: sboot.c,v 1.11 2012/12/05 23:20:13 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -54,7 +54,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include "sboot.h" diff --git a/sys/arch/mvme88k/stand/sboot/clock.c b/sys/arch/mvme88k/stand/sboot/clock.c index 5ba228de2da..180a7c746db 100644 --- a/sys/arch/mvme88k/stand/sboot/clock.c +++ b/sys/arch/mvme88k/stand/sboot/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -46,7 +46,7 @@ * Clock driver. */ -#include <sys/cdefs.h> +#include <sys/types.h> #include "sboot.h" #include "clockreg.h" diff --git a/sys/arch/mvme88k/stand/sboot/etherfun.c b/sys/arch/mvme88k/stand/sboot/etherfun.c index 543e7df47a9..f19bb5918f5 100644 --- a/sys/arch/mvme88k/stand/sboot/etherfun.c +++ b/sys/arch/mvme88k/stand/sboot/etherfun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: etherfun.c,v 1.3 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: etherfun.c,v 1.4 2012/12/05 23:20:14 deraadt Exp $ */ /* * @@ -33,7 +33,7 @@ */ /* etherfun.c */ -#include <sys/cdefs.h> +#include <sys/types.h> #include "sboot.h" #include "etherfun.h" diff --git a/sys/arch/mvme88k/stand/sboot/if_le.c b/sys/arch/mvme88k/stand/sboot/if_le.c index 10307d944ea..4a883e8b186 100644 --- a/sys/arch/mvme88k/stand/sboot/if_le.c +++ b/sys/arch/mvme88k/stand/sboot/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -54,7 +54,7 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#include <sys/types.h> #include "sboot.h" #include "if_lereg.h" diff --git a/sys/arch/mvme88k/stand/sboot/sboot.c b/sys/arch/mvme88k/stand/sboot/sboot.c index 4135a122c42..5ee58e6afd0 100644 --- a/sys/arch/mvme88k/stand/sboot/sboot.c +++ b/sys/arch/mvme88k/stand/sboot/sboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */ +/* $OpenBSD: sboot.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -54,7 +54,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> +#include <sys/types.h> #include "sboot.h" void diff --git a/sys/arch/octeon/dev/cn30xxasx.c b/sys/arch/octeon/dev/cn30xxasx.c index 9d75b1069d9..ff0d1427b7d 100644 --- a/sys/arch/octeon/dev/cn30xxasx.c +++ b/sys/arch/octeon/dev/cn30xxasx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxasx.c,v 1.2 2011/06/24 02:13:23 yasuoka Exp $ */ +/* $OpenBSD: cn30xxasx.c,v 1.3 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/octeon/dev/cn30xxfau.c b/sys/arch/octeon/dev/cn30xxfau.c index 913de29026d..70f9d44dde6 100644 --- a/sys/arch/octeon/dev/cn30xxfau.c +++ b/sys/arch/octeon/dev/cn30xxfau.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfau.c,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxfau.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/octeon/dev/cn30xxfpa.c b/sys/arch/octeon/dev/cn30xxfpa.c index 1595b79807c..f0f7c799fbe 100644 --- a/sys/arch/octeon/dev/cn30xxfpa.c +++ b/sys/arch/octeon/dev/cn30xxfpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfpa.c,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxfpa.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -28,8 +28,6 @@ #undef FPADEBUG -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c index b647f5c19dc..8ace5384dd3 100644 --- a/sys/arch/octeon/dev/cn30xxgmx.c +++ b/sys/arch/octeon/dev/cn30xxgmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmx.c,v 1.4 2012/11/28 01:15:33 brad Exp $ */ +/* $OpenBSD: cn30xxgmx.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -31,14 +31,11 @@ * take no thought for other GMX interface */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> #include <sys/device.h> #include <sys/lock.h> -#include <sys/cdefs.h> #include <sys/malloc.h> #include <sys/syslog.h> diff --git a/sys/arch/octeon/dev/cn30xxipd.c b/sys/arch/octeon/dev/cn30xxipd.c index c3897c29856..671a5eefe26 100644 --- a/sys/arch/octeon/dev/cn30xxipd.c +++ b/sys/arch/octeon/dev/cn30xxipd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxipd.c,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxipd.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/octeon/dev/cn30xxpko.c b/sys/arch/octeon/dev/cn30xxpko.c index 0afdd9200fb..509ffa79abf 100644 --- a/sys/arch/octeon/dev/cn30xxpko.c +++ b/sys/arch/octeon/dev/cn30xxpko.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxpko.c,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxpko.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/octeon/dev/cn30xxpow.c b/sys/arch/octeon/dev/cn30xxpow.c index e28f2753362..35577ed11fa 100644 --- a/sys/arch/octeon/dev/cn30xxpow.c +++ b/sys/arch/octeon/dev/cn30xxpow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxpow.c,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxpow.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> diff --git a/sys/arch/octeon/dev/cn30xxsmi.c b/sys/arch/octeon/dev/cn30xxsmi.c index f5807a9326a..37b9ad9d4df 100644 --- a/sys/arch/octeon/dev/cn30xxsmi.c +++ b/sys/arch/octeon/dev/cn30xxsmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxsmi.c,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxsmi.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/arch/powerpc/powerpc/bcopy.c b/sys/arch/powerpc/powerpc/bcopy.c index b21ccba2fe4..8a2211aa1e4 100644 --- a/sys/arch/powerpc/powerpc/bcopy.c +++ b/sys/arch/powerpc/powerpc/bcopy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcopy.c,v 1.6 2012/10/25 04:07:50 deraadt Exp $ */ +/* $OpenBSD: bcopy.c,v 1.7 2012/12/05 23:20:14 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -32,10 +32,6 @@ */ -#include <sys/cdefs.h> -/* -#include <string.h> -*/ #include <sys/types.h> #include <sys/systm.h> diff --git a/sys/arch/sparc64/stand/ofwboot/openfirm.h b/sys/arch/sparc64/stand/ofwboot/openfirm.h index 47e41197470..874201d09ff 100644 --- a/sys/arch/sparc64/stand/ofwboot/openfirm.h +++ b/sys/arch/sparc64/stand/ofwboot/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.4 2002/03/14 03:16:01 millert Exp $ */ +/* $OpenBSD: openfirm.h,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */ /* $NetBSD: openfirm.h,v 1.1 2000/08/20 14:58:42 mrg Exp $ */ /* @@ -35,7 +35,6 @@ * Prototypes for Openfirmware Interface Routines */ -#include <sys/cdefs.h> #include <sys/types.h> #include <machine/openfirm.h> diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h index aa30873fdd4..a9e076ab2ea 100644 --- a/sys/arch/vax/include/cpu.h +++ b/sys/arch/vax/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.41 2012/12/02 07:03:31 guenther Exp $ */ +/* $OpenBSD: cpu.h,v 1.42 2012/12/05 23:20:15 deraadt Exp $ */ /* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */ /* @@ -35,7 +35,6 @@ #define _MACHINE_CPU_H_ #ifdef _KERNEL -#include <sys/cdefs.h> #include <sys/device.h> #include <sys/evcount.h> diff --git a/sys/arch/vax/mscp/mscp.c b/sys/arch/vax/mscp/mscp.c index d4034fdde5a..01fd2cd044e 100644 --- a/sys/arch/vax/mscp/mscp.c +++ b/sys/arch/vax/mscp/mscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp.c,v 1.10 2007/10/08 17:48:06 krw Exp $ */ +/* $OpenBSD: mscp.c,v 1.11 2012/12/05 23:20:15 deraadt Exp $ */ /* $NetBSD: mscp.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */ /* @@ -40,8 +40,6 @@ * MSCP generic driver routines */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/buf.h> #include <sys/malloc.h> diff --git a/sys/arch/vax/mscp/mscp_subr.c b/sys/arch/vax/mscp/mscp_subr.c index 37376f67bf0..ffd0dff42d4 100644 --- a/sys/arch/vax/mscp/mscp_subr.c +++ b/sys/arch/vax/mscp/mscp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_subr.c,v 1.11 2011/07/06 18:32:59 miod Exp $ */ +/* $OpenBSD: mscp_subr.c,v 1.12 2012/12/05 23:20:15 deraadt Exp $ */ /* $NetBSD: mscp_subr.c,v 1.18 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -39,8 +39,6 @@ * MSCP generic driver routines */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/device.h> #include <sys/buf.h> diff --git a/sys/arch/vax/mscp/mscp_tape.c b/sys/arch/vax/mscp/mscp_tape.c index d2f2f093bc8..a249dae0e9a 100644 --- a/sys/arch/vax/mscp/mscp_tape.c +++ b/sys/arch/vax/mscp/mscp_tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_tape.c,v 1.13 2012/11/25 22:13:46 jsg Exp $ */ +/* $OpenBSD: mscp_tape.c,v 1.14 2012/12/05 23:20:15 deraadt Exp $ */ /* $NetBSD: mscp_tape.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -41,8 +41,6 @@ * Write status handling code. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/device.h> #include <sys/kernel.h> diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c index c8951a70102..4a9a32dbadc 100644 --- a/sys/arch/vax/vsa/asc_vsbus.c +++ b/sys/arch/vax/vsa/asc_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_vsbus.c,v 1.14 2011/09/11 19:29:01 miod Exp $ */ +/* $OpenBSD: asc_vsbus.c,v 1.15 2012/12/05 23:20:15 deraadt Exp $ */ /* $NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ - #include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/crypto/cmac.h b/sys/crypto/cmac.h index d90ff1cabe2..de0ec840d42 100644 --- a/sys/crypto/cmac.h +++ b/sys/crypto/cmac.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmac.h,v 1.1 2008/08/12 15:43:00 damien Exp $ */ +/* $OpenBSD: cmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -29,8 +29,6 @@ typedef struct _AES_CMAC_CTX { u_int M_n; } AES_CMAC_CTX; -#include <sys/cdefs.h> - __BEGIN_DECLS void AES_CMAC_Init(AES_CMAC_CTX *); void AES_CMAC_SetKey(AES_CMAC_CTX *, const u_int8_t [AES_CMAC_KEY_LENGTH]); diff --git a/sys/crypto/des_locl.h b/sys/crypto/des_locl.h index 44c9289973f..e65658037a1 100644 --- a/sys/crypto/des_locl.h +++ b/sys/crypto/des_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: des_locl.h,v 1.3 2005/06/13 10:56:44 hshoexer Exp $ */ +/* $OpenBSD: des_locl.h,v 1.4 2012/12/05 23:20:15 deraadt Exp $ */ /* lib/des/des_locl.h */ /* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) @@ -50,7 +50,6 @@ #ifndef HEADER_DES_LOCL_H #define HEADER_DES_LOCL_H -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/systm.h> diff --git a/sys/crypto/gmac.h b/sys/crypto/gmac.h index ce26faf2863..94c1247bbd7 100644 --- a/sys/crypto/gmac.h +++ b/sys/crypto/gmac.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gmac.h,v 1.1 2010/09/22 11:54:23 mikeb Exp $ */ +/* $OpenBSD: gmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $ */ /* * Copyright (c) 2010 Mike Belopuhov <mike@vantronix.net> @@ -37,8 +37,6 @@ typedef struct _AES_GMAC_CTX { int rounds; } AES_GMAC_CTX; -#include <sys/cdefs.h> - __BEGIN_DECLS void AES_GMAC_Init(AES_GMAC_CTX *); void AES_GMAC_Setkey(AES_GMAC_CTX *, const uint8_t *, uint16_t); diff --git a/sys/crypto/hmac.h b/sys/crypto/hmac.h index 99b1dd63b99..886bb49d0f0 100644 --- a/sys/crypto/hmac.h +++ b/sys/crypto/hmac.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hmac.h,v 1.2 2008/09/06 22:23:20 djm Exp $ */ +/* $OpenBSD: hmac.h,v 1.3 2012/12/05 23:20:15 deraadt Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -37,8 +37,6 @@ typedef struct _HMAC_SHA256_CTX { u_int key_len; } HMAC_SHA256_CTX; -#include <sys/cdefs.h> - __BEGIN_DECLS void HMAC_MD5_Init(HMAC_MD5_CTX *, const u_int8_t *, u_int) diff --git a/sys/crypto/key_wrap.h b/sys/crypto/key_wrap.h index 4c984e13d9d..f91ce5f4c06 100644 --- a/sys/crypto/key_wrap.h +++ b/sys/crypto/key_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: key_wrap.h,v 1.1 2008/08/12 15:43:00 damien Exp $ */ +/* $OpenBSD: key_wrap.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -23,8 +23,6 @@ typedef struct _aes_key_wrap_ctx { rijndael_ctx ctx; } aes_key_wrap_ctx; -#include <sys/cdefs.h> - __BEGIN_DECLS void aes_key_wrap_set_key(aes_key_wrap_ctx *, const u_int8_t *, size_t); diff --git a/sys/crypto/md5.h b/sys/crypto/md5.h index b629c3e81bd..99d60316ea5 100644 --- a/sys/crypto/md5.h +++ b/sys/crypto/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.1 2004/05/07 14:42:26 millert Exp $ */ +/* $OpenBSD: md5.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $ */ /* * This code implements the MD5 message-digest algorithm. @@ -24,8 +24,6 @@ typedef struct MD5Context { u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ } MD5_CTX; -#include <sys/cdefs.h> - __BEGIN_DECLS void MD5Init(MD5_CTX *); void MD5Update(MD5_CTX *, const u_int8_t *, size_t) diff --git a/sys/crypto/michael.h b/sys/crypto/michael.h index 3b7c435842e..79018d89784 100644 --- a/sys/crypto/michael.h +++ b/sys/crypto/michael.h @@ -1,4 +1,4 @@ -/* $OpenBSD: michael.h,v 1.1 2006/03/21 18:40:54 reyk Exp $ */ +/* $OpenBSD: michael.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> @@ -30,8 +30,6 @@ typedef struct michael_context { u_int michael_count; } MICHAEL_CTX; -#include <sys/cdefs.h> - __BEGIN_DECLS void michael_init(MICHAEL_CTX *); void michael_update(MICHAEL_CTX *, const u_int8_t *, u_int) diff --git a/sys/crypto/sha2.h b/sys/crypto/sha2.h index c9e7500821f..6bbdb80b79e 100644 --- a/sys/crypto/sha2.h +++ b/sys/crypto/sha2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sha2.h,v 1.3 2008/09/06 22:23:20 djm Exp $ */ +/* $OpenBSD: sha2.h,v 1.4 2012/12/05 23:20:15 deraadt Exp $ */ /* * FILE: sha2.h @@ -60,8 +60,6 @@ typedef struct _SHA2_CTX { u_int8_t buffer[SHA512_BLOCK_LENGTH]; } SHA2_CTX; -#include <sys/cdefs.h> - __BEGIN_DECLS void SHA256Init(SHA2_CTX *); void SHA256Update(SHA2_CTX *, const u_int8_t *, size_t) diff --git a/sys/ddb/db_structinfo.c b/sys/ddb/db_structinfo.c index 84a4e35a6e0..e32d484a367 100644 --- a/sys/ddb/db_structinfo.c +++ b/sys/ddb/db_structinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_structinfo.c,v 1.4 2010/11/18 21:13:19 miod Exp $ */ +/* $OpenBSD: db_structinfo.c,v 1.5 2012/12/05 23:20:15 deraadt Exp $ */ /* public domain */ /* * This file is intended to be compiled with debug information, @@ -8,7 +8,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/cdefs.h> #include <sys/device.h> #include <sys/proc.h> diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index 77a46a094b3..2a8537f821b 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_cardbus.c,v 1.20 2011/04/02 17:47:04 jasper Exp $ */ +/* $OpenBSD: if_rtw_cardbus.c,v 1.21 2012/12/05 23:20:16 deraadt Exp $ */ /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */ /*- @@ -67,8 +67,6 @@ * TBD factor with atw, tlp Cardbus front-ends? */ -#include <sys/cdefs.h> - #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index 900e44696bd..be26e6fa4a7 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.98 2012/10/27 16:13:28 claudio Exp $ */ +/* $OpenBSD: acx.c,v 1.99 2012/12/05 23:20:16 deraadt Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -86,7 +86,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c index d0aa0b0e21d..6fed99b0324 100644 --- a/sys/dev/ic/aic79xx.c +++ b/sys/dev/ic/aic79xx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.c,v 1.49 2012/02/24 06:19:00 guenther Exp $ */ +/* $OpenBSD: aic79xx.c,v 1.50 2012/12/05 23:20:16 deraadt Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -71,8 +71,6 @@ * FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.33 2004/11/18 20:22:30 gibbs Exp */ -#include <sys/cdefs.h> - #include <dev/ic/aic79xx_openbsd.h> #include <dev/ic/aic79xx_inline.h> #include <dev/ic/aic79xx.h> diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index 8638f0c5c25..a2184e4c593 100644 --- a/sys/dev/ic/aic79xx_openbsd.c +++ b/sys/dev/ic/aic79xx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.c,v 1.38 2012/02/24 06:19:00 guenther Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.39 2012/12/05 23:20:16 deraadt Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -60,11 +60,6 @@ * */ -#include <sys/cdefs.h> -/* -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.16 2003/12/17 00:02:09 gibbs Exp $"); -*/ - #include <dev/ic/aic79xx_openbsd.h> #include <dev/ic/aic79xx_inline.h> #include <dev/ic/aic79xx.h> diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index 16ae5dcbb11..871ce82378b 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx.c,v 1.84 2010/03/14 14:37:01 krw Exp $ */ +/* $OpenBSD: aic7xxx.c,v 1.85 2012/12/05 23:20:16 deraadt Exp $ */ /* $NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -40,15 +40,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxx.c,v 1.84 2010/03/14 14:37:01 krw Exp $ + * $Id: aic7xxx.c,v 1.85 2012/12/05 23:20:16 deraadt Exp $ */ /* * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003 */ -#include <sys/cdefs.h> -/* __FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.100 2004/05/11 20:39:46 gibbs Exp $"); */ - #include <dev/ic/aic7xxx_openbsd.h> #ifdef SMALL_KERNEL #define IO_EXPAND diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c index 244a2f5c809..0c5879b685a 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $OpenBSD: an.c,v 1.58 2010/08/27 17:08:00 jsg Exp $ */ +/* $OpenBSD: an.c,v 1.59 2012/12/05 23:20:16 deraadt Exp $ */ /* $NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -77,8 +77,6 @@ * IETF meeting. */ -#include <sys/cdefs.h> - #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index 89be52d8cdd..75ae03f29b4 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwi.c,v 1.95 2010/08/27 17:08:00 jsg Exp $ */ +/* $OpenBSD: bwi.c,v 1.96 2012/12/05 23:20:16 deraadt Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -38,7 +38,6 @@ #include "bpfilter.h" -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/types.h> diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index b86af946cae..d0536987a47 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.94 2012/09/04 19:01:33 claudio Exp $ */ +/* $OpenBSD: malo.c,v 1.95 2012/12/05 23:20:18 deraadt Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -19,7 +19,6 @@ #include "bpfilter.h" -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/types.h> diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c index 719a945364c..692b72c9bec 100644 --- a/sys/dev/ic/pgt.c +++ b/sys/dev/ic/pgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pgt.c,v 1.68 2011/12/01 23:34:08 miod Exp $ */ +/* $OpenBSD: pgt.c,v 1.69 2012/12/05 23:20:18 deraadt Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -44,7 +44,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 9c5abba8312..f79999753b8 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.81 2010/09/07 16:21:43 deraadt Exp $ */ +/* $OpenBSD: rtw.c,v 1.82 2012/12/05 23:20:19 deraadt Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -35,7 +35,6 @@ * Device driver for the Realtek RTL8180 802.11 MAC/BBP. */ -#include <sys/cdefs.h> #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c index aa6fb679c69..a9d90a1061f 100644 --- a/sys/dev/microcode/aic7xxx/aicasm.c +++ b/sys/dev/microcode/aic7xxx/aicasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aicasm.c,v 1.14 2005/10/04 23:46:14 krw Exp $ */ +/* $OpenBSD: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $ */ /* * Aic7xxx SCSI host adapter firmware asssembler * @@ -38,11 +38,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aicasm.c,v 1.14 2005/10/04 23:46:14 krw Exp $ + * $Id: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.37 2004/03/12 21:45:25 trhodes Exp $ */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/mman.h> diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c index dd9d4945c26..7b3c2a8f3a0 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c +++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aicasm_symbol.c,v 1.10 2009/10/28 23:22:45 schwarze Exp $ */ +/* $OpenBSD: aicasm_symbol.c,v 1.11 2012/12/05 23:20:19 deraadt Exp $ */ /* $NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $ */ /* @@ -43,7 +43,6 @@ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.23 2003/01/20 18:01:37 gibbs Exp $ */ -#include <sys/cdefs.h> #include <sys/types.h> #ifdef __linux__ diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c index 343b951265f..6c89c339181 100644 --- a/sys/dev/pci/ahd_pci.c +++ b/sys/dev/pci/ahd_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahd_pci.c,v 1.20 2012/09/30 21:46:09 brad Exp $ */ +/* $OpenBSD: ahd_pci.c,v 1.21 2012/12/05 23:20:19 deraadt Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -69,11 +69,6 @@ * */ -#include <sys/cdefs.h> -/* -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.18 2004/02/04 16:38:38 gibbs Exp $"); -*/ - #include <dev/ic/aic79xx_openbsd.h> #include <dev/ic/aic79xx_inline.h> #include <dev/ic/aic79xx.h> diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 2b64fb1eaa6..0807d013996 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.97 2012/07/05 13:50:15 phessler Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.98 2012/12/05 23:20:20 deraadt Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -30,11 +30,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if 0 -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $"); -#endif - /* * The following controllers are supported by this driver: * BCM5706C A2, A3 diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 120729cdec3..a63d2dca9d7 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,16 +31,11 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.70 2012/11/26 01:17:41 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.71 2012/12/05 23:20:20 deraadt Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ -#if 0 -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: if_em_hw.c,v 1.16 2005/05/26 23:32:02 tackerman Exp $"); -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c index 230cce32364..aafad4db5b2 100644 --- a/sys/dev/pci/if_rtw_pci.c +++ b/sys/dev/pci/if_rtw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_pci.c,v 1.16 2012/10/18 21:44:21 deraadt Exp $ */ +/* $OpenBSD: if_rtw_pci.c,v 1.17 2012/12/05 23:20:20 deraadt Exp $ */ /* $NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $ */ /*- @@ -39,7 +39,6 @@ * Derived from the ``Tulip'' PCI bus front-end. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c index f4444871f23..706f99dcd74 100644 --- a/sys/dev/pci/if_vio.c +++ b/sys/dev/pci/if_vio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vio.c,v 1.8 2012/12/03 21:04:49 sf Exp $ */ +/* $OpenBSD: if_vio.c,v 1.9 2012/12/05 23:20:20 deraadt Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg. @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c index f467c305197..f1a31cc6834 100644 --- a/sys/dev/pci/mmuagp.c +++ b/sys/dev/pci/mmuagp.c @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c index 4b3441b2b17..451648e2e89 100644 --- a/sys/dev/pci/safe.c +++ b/sys/dev/pci/safe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safe.c,v 1.34 2012/01/13 09:53:24 mikeb Exp $ */ +/* $OpenBSD: safe.c,v 1.35 2012/12/05 23:20:20 deraadt Exp $ */ /*- * Copyright (c) 2003 Sam Leffler, Errno Consulting @@ -29,8 +29,6 @@ * $FreeBSD: /repoman/r/ncvs/src/sys/dev/safe/safe.c,v 1.1 2003/07/21 21:46:07 sam Exp $ */ -#include <sys/cdefs.h> - /* * SafeNet SafeXcel-1141 hardware crypto accelerator */ diff --git a/sys/dev/pci/vioblk.c b/sys/dev/pci/vioblk.c index de549fe1965..6fdbf797ba8 100644 --- a/sys/dev/pci/vioblk.c +++ b/sys/dev/pci/vioblk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioblk.c,v 1.2 2012/10/12 21:12:19 reyk Exp $ */ +/* $OpenBSD: vioblk.c,v 1.3 2012/12/05 23:20:21 deraadt Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch. @@ -46,7 +46,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c index ad25f3e5120..8256a0e3f54 100644 --- a/sys/dev/pci/virtio.c +++ b/sys/dev/pci/virtio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio.c,v 1.2 2012/10/12 21:12:19 reyk Exp $ */ +/* $OpenBSD: virtio.c,v 1.3 2012/12/05 23:20:21 deraadt Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -27,8 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c index 0662b46b9c9..d10e8a01b06 100644 --- a/sys/dev/pci/virtio_pci.c +++ b/sys/dev/pci/virtio_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio_pci.c,v 1.3 2012/10/12 21:12:19 reyk Exp $ */ +/* $OpenBSD: virtio_pci.c,v 1.4 2012/12/05 23:20:21 deraadt Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -27,8 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c index ace45a2d80b..0d5b06a377f 100644 --- a/sys/dev/sbus/if_le_lebuffer.c +++ b/sys/dev/sbus/if_le_lebuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_lebuffer.c,v 1.9 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: if_le_lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $ */ /* $NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $ */ /*- @@ -33,7 +33,6 @@ #include "bpfilter.h" -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c index 8581fb91de5..18bf59ef48b 100644 --- a/sys/dev/sbus/lebuffer.c +++ b/sys/dev/sbus/lebuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lebuffer.c,v 1.9 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $ */ /* $NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */ /*- @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 82f2537effd..a9e3bb6d21e 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.114 2012/11/28 01:15:33 brad Exp $ */ +/* $OpenBSD: if_axe.c,v 1.115 2012/12/05 23:20:21 deraadt Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org> @@ -48,8 +48,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the * LinkSys USB200M and various other adapters. diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index cecf66beca2..0dafb22225b 100644 --- a/sys/dev/usb/if_mos.c +++ b/sys/dev/usb/if_mos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mos.c,v 1.17 2012/10/22 03:23:19 brad Exp $ */ +/* $OpenBSD: if_mos.c,v 1.18 2012/12/05 23:20:21 deraadt Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net> @@ -64,8 +64,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - /* * Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller * The datasheet is available at the following URL: diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 63c0cacb8e0..c32edcd2b6b 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.58 2011/09/04 18:34:02 jsg Exp $ */ +/* $OpenBSD: if_udav.c,v 1.59 2012/12/05 23:20:21 deraadt Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -43,8 +43,6 @@ * External PHYs */ -#include <sys/cdefs.h> - #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index 4c9432eaf06..b7fd12db56f 100644 --- a/sys/dev/usb/if_urndis.c +++ b/sys/dev/usb/if_urndis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urndis.c,v 1.34 2012/06/20 10:51:27 fgsch Exp $ */ +/* $OpenBSD: if_urndis.c,v 1.35 2012/12/05 23:20:21 deraadt Exp $ */ /* * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org> @@ -19,8 +19,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/cdefs.h> - #include "bpfilter.h" #include <sys/param.h> diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 91d38404171..d59eefaff4a 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: ubsa.c,v 1.54 2012/12/05 23:20:21 deraadt Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -54,8 +54,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/vesa/vesabios.c b/sys/dev/vesa/vesabios.c index 8e5a974c5d8..1e1fe69203b 100644 --- a/sys/dev/vesa/vesabios.c +++ b/sys/dev/vesa/vesabios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vesabios.c,v 1.5 2011/04/05 19:54:35 jasper Exp $ */ +/* $OpenBSD: vesabios.c,v 1.6 2012/12/05 23:20:22 deraadt Exp $ */ /* * Copyright (c) 2002, 2004 @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c index 89f833a5ca9..6b92b5a9cd1 100644 --- a/sys/dev/videomode/edid.c +++ b/sys/dev/videomode/edid.c @@ -31,9 +31,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -/* __KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.5 2007/03/07 19:56:40 macallan Exp $"); */ - #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> diff --git a/sys/dev/videomode/modelines2c.awk b/sys/dev/videomode/modelines2c.awk index 74973a2f9d6..424610ceaf6 100644 --- a/sys/dev/videomode/modelines2c.awk +++ b/sys/dev/videomode/modelines2c.awk @@ -1,6 +1,6 @@ #! /usr/bin/awk -f # $NetBSD: modelines2c.awk,v 1.4 2006/10/26 23:19:50 bjh21 Exp $ -# $OpenBSD: modelines2c.awk,v 1.1 2009/10/08 20:35:44 matthieu Exp $ +# $OpenBSD: modelines2c.awk,v 1.2 2012/12/05 23:20:22 deraadt Exp $ # # Copyright (c) 2006 Itronix Inc. # All rights reserved. @@ -49,7 +49,7 @@ NR == 1 { printf(" *\t%s\n", VERSION); printf(" */\n\n"); - printf("#include <sys/cdefs.h>\n"); + printf("#include <sys/types.h>\n"); printf("#include <dev/videomode/videomode.h>\n\n"); diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c index 4e1f7a8c4ff..d60de2c0e58 100644 --- a/sys/dev/videomode/vesagtf.c +++ b/sys/dev/videomode/vesagtf.c @@ -151,8 +151,6 @@ #ifdef _KERNEL -#include <sys/cdefs.h> - #include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/dev/videomode/videomode.c b/sys/dev/videomode/videomode.c index ba5a559a836..2de6364ed77 100644 --- a/sys/dev/videomode/videomode.c +++ b/sys/dev/videomode/videomode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: videomode.c,v 1.1 2009/10/08 20:35:44 matthieu Exp $ */ +/* $OpenBSD: videomode.c,v 1.2 2012/12/05 23:20:22 deraadt Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -7,7 +7,6 @@ * NetBSD: modelines,v 1.7 2009/01/21 14:40:25 jnemeth Exp */ -#include <sys/cdefs.h> #include <dev/videomode/videomode.h> /* diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c index 6766332b7f9..55a167db95a 100644 --- a/sys/dev/wscons/wsevent.c +++ b/sys/dev/wscons/wsevent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsevent.c,v 1.7 2007/09/11 13:39:34 gilles Exp $ */ +/* $OpenBSD: wsevent.c,v 1.8 2012/12/05 23:20:22 deraadt Exp $ */ /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */ /* @@ -31,8 +31,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c index da902602df8..b5377990c61 100644 --- a/sys/dev/wscons/wskbdutil.c +++ b/sys/dev/wscons/wskbdutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbdutil.c,v 1.9 2010/08/28 12:48:14 miod Exp $ */ +/* $OpenBSD: wskbdutil.c,v 1.10 2012/12/05 23:20:22 deraadt Exp $ */ /* $NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $ */ /*- @@ -32,7 +32,6 @@ #include <sys/param.h> #include <sys/types.h> -#include <sys/cdefs.h> #include <sys/errno.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/lib/libkern/arch/powerpc/__eabi.c b/sys/lib/libkern/arch/powerpc/__eabi.c index 813c700053b..dac0138e6fa 100644 --- a/sys/lib/libkern/arch/powerpc/__eabi.c +++ b/sys/lib/libkern/arch/powerpc/__eabi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: __eabi.c,v 1.4 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: __eabi.c,v 1.5 2012/12/05 23:20:22 deraadt Exp $ */ /* $NetBSD: __main.c,v 1.3 1994/10/26 06:42:13 cgd Exp $ */ /* @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> +#include <sys/types.h> void __eabi(void); diff --git a/sys/lib/libkern/getsn.c b/sys/lib/libkern/getsn.c index ed4ce8adfc8..3bb3f218ad7 100644 --- a/sys/lib/libkern/getsn.c +++ b/sys/lib/libkern/getsn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getsn.c,v 1.5 2007/05/03 01:21:32 deraadt Exp $ */ +/* $OpenBSD: getsn.c,v 1.6 2012/12/05 23:20:22 deraadt Exp $ */ /* * Copyright (c) 1996 Theo de Raadt @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/systm.h> #include <dev/cons.h> diff --git a/sys/lib/libkern/softfloat.c b/sys/lib/libkern/softfloat.c index 6b0d4b493d5..45b93bd4282 100644 --- a/sys/lib/libkern/softfloat.c +++ b/sys/lib/libkern/softfloat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softfloat.c,v 1.4 2009/10/27 23:59:35 deraadt Exp $ */ +/* $OpenBSD: softfloat.c,v 1.5 2012/12/05 23:20:22 deraadt Exp $ */ /* $NetBSD: softfloat.c,v 1.1 2001/04/26 03:10:47 ross Exp $ */ /* @@ -49,8 +49,6 @@ this code that are retained. =============================================================================== */ -#include <sys/cdefs.h> - #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" #endif diff --git a/sys/lib/libsa/netif.c b/sys/lib/libsa/netif.c index 9ca5ffa77be..15c0785c20f 100644 --- a/sys/lib/libsa/netif.c +++ b/sys/lib/libsa/netif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netif.c,v 1.8 2003/08/11 06:23:09 deraadt Exp $ */ +/* $OpenBSD: netif.c,v 1.9 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: netif.c,v 1.7 1996/10/13 02:29:03 christos Exp $ */ /* @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/types.h> -#include <sys/cdefs.h> #include <sys/mount.h> #include <netinet/in.h> diff --git a/sys/lib/libsa/printf.c b/sys/lib/libsa/printf.c index a820fcbde5a..dfb9ac9e662 100644 --- a/sys/lib/libsa/printf.c +++ b/sys/lib/libsa/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.24 2006/09/18 21:11:50 mpf Exp $ */ +/* $OpenBSD: printf.c,v 1.25 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $ */ /*- @@ -55,7 +55,6 @@ * reg=3<BITTWO,BITONE> */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/stdarg.h> diff --git a/sys/lib/libsa/snprintf.c b/sys/lib/libsa/snprintf.c index 4a075d0b11a..948c9be4332 100644 --- a/sys/lib/libsa/snprintf.c +++ b/sys/lib/libsa/snprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snprintf.c,v 1.4 2004/01/03 14:08:53 espie Exp $ */ +/* $OpenBSD: snprintf.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $ */ /*- @@ -32,7 +32,6 @@ * @(#)printf.c 8.1 (Berkeley) 6/11/93 */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/stdarg.h> diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index a732cbc6633..4a4f9a39f38 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.53 2012/10/09 12:03:51 jsing Exp $ */ +/* $OpenBSD: stand.h,v 1.54 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */ /*- @@ -33,7 +33,6 @@ */ #include <sys/types.h> -#include <sys/cdefs.h> #include <sys/stat.h> #include <sys/stdarg.h> #include "saerrno.h" diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 11b979ec3e4..2b60f34c1b4 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dl.h,v 1.7 2011/07/08 01:09:52 claudio Exp $ */ +/* $OpenBSD: if_dl.h,v 1.8 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: if_dl.h,v 1.8 1995/03/26 20:30:13 jtc Exp $ */ /* @@ -73,8 +73,6 @@ struct sockaddr_dl { #ifndef _KERNEL -#include <sys/cdefs.h> - __BEGIN_DECLS void link_addr(const char *, struct sockaddr_dl *); char *link_ntoa(const struct sockaddr_dl *); diff --git a/sys/net/pipex.h b/sys/net/pipex.h index 239f721b9e2..197a34bfe7a 100644 --- a/sys/net/pipex.h +++ b/sys/net/pipex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.h,v 1.15 2012/09/19 22:37:23 jsg Exp $ */ +/* $OpenBSD: pipex.h,v 1.16 2012/12/05 23:20:23 deraadt Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -192,7 +192,7 @@ struct pipex_iface_context { /* virtual pipex_session entry for multicast routing */ struct pipex_session *multicast_session; }; -#include <sys/cdefs.h> + __BEGIN_DECLS void pipex_init (void); void pipex_iface_init (struct pipex_iface_context *, struct ifnet *); diff --git a/sys/net/trunklacp.c b/sys/net/trunklacp.c index 3b742972a29..b960d1fc207 100644 --- a/sys/net/trunklacp.c +++ b/sys/net/trunklacp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trunklacp.c,v 1.13 2011/07/09 04:38:03 henning Exp $ */ +/* $OpenBSD: trunklacp.c,v 1.14 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */ /* $FreeBSD:ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $ */ @@ -29,8 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> diff --git a/sys/netbt/l2cap_socket.c b/sys/netbt/l2cap_socket.c index 11f3f818398..5a584f59598 100644 --- a/sys/netbt/l2cap_socket.c +++ b/sys/netbt/l2cap_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: l2cap_socket.c,v 1.4 2009/11/21 13:05:32 guenther Exp $ */ +/* $OpenBSD: l2cap_socket.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: l2cap_socket.c,v 1.9 2008/08/06 15:01:24 plunky Exp $ */ /*- @@ -31,8 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - /* load symbolic names */ #ifdef BLUETOOTH_DEBUG #define PRUREQUESTS diff --git a/sys/netbt/l2cap_upper.c b/sys/netbt/l2cap_upper.c index 773c8e0d58c..987373c38a4 100644 --- a/sys/netbt/l2cap_upper.c +++ b/sys/netbt/l2cap_upper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: l2cap_upper.c,v 1.4 2009/11/21 13:05:32 guenther Exp $ */ +/* $OpenBSD: l2cap_upper.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: l2cap_upper.c,v 1.9 2008/08/06 15:01:24 plunky Exp $ */ /*- @@ -31,8 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> diff --git a/sys/netbt/sco_socket.c b/sys/netbt/sco_socket.c index 766f5e384e5..94a674041a8 100644 --- a/sys/netbt/sco_socket.c +++ b/sys/netbt/sco_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sco_socket.c,v 1.4 2009/11/21 13:05:32 guenther Exp $ */ +/* $OpenBSD: sco_socket.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: sco_socket.c,v 1.11 2008/08/06 15:01:24 plunky Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - /* load symbolic names */ #ifdef BLUETOOTH_DEBUG #define PRUREQUESTS diff --git a/sys/netbt/sco_upper.c b/sys/netbt/sco_upper.c index a4c16b40fe9..d30e4bbc63d 100644 --- a/sys/netbt/sco_upper.c +++ b/sys/netbt/sco_upper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sco_upper.c,v 1.4 2009/11/21 13:05:32 guenther Exp $ */ +/* $OpenBSD: sco_upper.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: sco_upper.c,v 1.8 2008/08/06 15:01:24 plunky Exp $ */ /*- @@ -32,8 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h index 39a40292e00..f7646997424 100644 --- a/sys/nfs/krpc.h +++ b/sys/nfs/krpc.h @@ -1,8 +1,6 @@ -/* $OpenBSD: krpc.h,v 1.6 2008/05/17 17:27:24 thib Exp $ */ +/* $OpenBSD: krpc.h,v 1.7 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $ */ -#include <sys/cdefs.h> - int krpc_call(struct sockaddr_in *, u_int, u_int, u_int, struct mbuf **, struct mbuf **, int); int krpc_portmap(struct sockaddr_in *, u_int, u_int, u_int16_t *); diff --git a/sys/nfs/nfs_kq.c b/sys/nfs/nfs_kq.c index 09326898c77..55e91de88ff 100644 --- a/sys/nfs/nfs_kq.c +++ b/sys/nfs/nfs_kq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_kq.c,v 1.15 2009/01/19 23:40:36 thib Exp $ */ +/* $OpenBSD: nfs_kq.c,v 1.16 2012/12/05 23:20:23 deraadt Exp $ */ /* $NetBSD: nfs_kq.c,v 1.7 2003/10/30 01:43:10 simonb Exp $ */ /*- @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/sys/midiio.h b/sys/sys/midiio.h index 18e9d8caed8..647a090fc59 100644 --- a/sys/sys/midiio.h +++ b/sys/sys/midiio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: midiio.h,v 1.4 2008/06/26 05:42:20 ray Exp $ */ +/* $OpenBSD: midiio.h,v 1.5 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: midiio.h,v 1.7 1998/11/25 22:17:07 augustss Exp $ */ /*- @@ -38,7 +38,6 @@ * for naming. */ -#include <sys/cdefs.h> #include <machine/endian.h> /* for _QUAD_LOWWORD */ /* diff --git a/sys/sys/param.h b/sys/sys/param.h index 31ec9615d35..e637827cc95 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.96 2012/06/20 21:40:55 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.97 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -78,7 +78,6 @@ /* More types and definitions used throughout the kernel. */ #ifdef _KERNEL -#include <sys/cdefs.h> #include <sys/errno.h> #include <sys/time.h> #include <sys/resource.h> diff --git a/sys/sys/select.h b/sys/sys/select.h index fdabfd9de46..6dc0416a0c2 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -1,4 +1,4 @@ -/* $OpenBSD: select.h,v 1.9 2006/03/21 08:17:33 otto Exp $ */ +/* $OpenBSD: select.h,v 1.10 2012/12/05 23:20:24 deraadt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -34,7 +34,6 @@ #ifndef _SYS_SELECT_H_ #define _SYS_SELECT_H_ -#include <sys/cdefs.h> #include <sys/time.h> /* for types and struct timeval */ /* diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 8f8e032f8d8..7a444769d48 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.23 2011/11/22 21:13:30 guenther Exp $ */ +/* $OpenBSD: signal.h,v 1.24 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: signal.h,v 1.21 1996/02/09 18:25:32 christos Exp $ */ /* @@ -40,7 +40,6 @@ #ifndef _SYS_SIGNAL_H_ #define _SYS_SIGNAL_H_ -#include <sys/cdefs.h> #include <machine/signal.h> /* sigcontext; codes for SIGILL, SIGFPE */ #define _NSIG 33 /* counting 0 (mask is 1-32) */ diff --git a/sys/sys/stat.h b/sys/sys/stat.h index 3f56097ecef..640e33ef893 100644 --- a/sys/sys/stat.h +++ b/sys/sys/stat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stat.h,v 1.20 2011/07/18 17:29:49 matthew Exp $ */ +/* $OpenBSD: stat.h,v 1.21 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: stat.h,v 1.20 1996/05/16 22:17:49 cgd Exp $ */ /*- @@ -40,7 +40,6 @@ #ifndef _SYS_STAT_H_ #define _SYS_STAT_H_ -#include <sys/cdefs.h> #include <sys/time.h> struct stat { diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 3ad7ddb292f..4843bb85237 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.125 2012/04/17 23:17:53 pirofti Exp $ */ +/* $OpenBSD: sysctl.h,v 1.126 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -975,7 +975,6 @@ int pflow_sysctl(int *, u_int, void *, size_t *, void *, size_t); int pipex_sysctl(int *, u_int, void *, size_t *, void *, size_t); #else /* !_KERNEL */ -#include <sys/cdefs.h> __BEGIN_DECLS int sysctl(int *, u_int, void *, size_t *, void *, size_t); diff --git a/sys/sys/time.h b/sys/sys/time.h index 1ac7013d8ca..b120fbf09a8 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.28 2012/05/10 19:13:12 kettenis Exp $ */ +/* $OpenBSD: time.h,v 1.29 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $ */ /* @@ -35,7 +35,6 @@ #ifndef _SYS_TIME_H_ #define _SYS_TIME_H_ -#include <sys/cdefs.h> #include <sys/types.h> #if __XPG_VISIBLE >= 420 && __XPG_VISIBLE < 600 diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h index b23a2b6c427..1dfb1daa9bf 100644 --- a/sys/ufs/ufs/quota.h +++ b/sys/ufs/ufs/quota.h @@ -1,4 +1,4 @@ -/* $OpenBSD: quota.h,v 1.9 2008/01/05 19:49:26 otto Exp $ */ +/* $OpenBSD: quota.h,v 1.10 2012/12/05 23:20:24 deraadt Exp $ */ /* $NetBSD: quota.h,v 1.6 1995/03/26 20:38:17 jtc Exp $ */ /* @@ -116,8 +116,6 @@ enum ufs_quota_flags { UFS_QUOTA_FORCE = 0x1000 /* don't check limits - just change it */ }; /* Change GID */ -#include <sys/cdefs.h> - struct dquot; struct inode; struct mount; |