Fix CVS Id usagediff -r1.6 -r1.7 src/sys/arch/arm/at91/at91pmc.c
(kamil)
--- src/sys/arch/arm/at91/at91pmc.c 2012/11/12 18:00:36 1.6
+++ src/sys/arch/arm/at91/at91pmc.c 2019/04/11 14:38:05 1.7
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | /* $Id: at91pmc.c,v 1.6 2012/11/12 18:00:36 skrll Exp $ */ | 1 | /* $Id: at91pmc.c,v 1.7 2019/04/11 14:38:05 kamil Exp $ */ | |
2 | /* $NetBSD: at91pmc.c,v 1.6 2012/11/12 18:00:36 skrll Exp $ */ | 2 | /* $NetBSD: at91pmc.c,v 1.7 2019/04/11 14:38:05 kamil Exp $ */ | |
3 | 3 | |||
4 | /* | 4 | /* | |
5 | * Copyright (c) 2007 Embedtronics Oy | 5 | * Copyright (c) 2007 Embedtronics Oy | |
6 | * All rights reserved. | 6 | * All rights reserved. | |
7 | * | 7 | * | |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without | |
9 | * modification, are permitted provided that the following conditions | 9 | * modification, are permitted provided that the following conditions | |
10 | * are met: | 10 | * are met: | |
11 | * 1. Redistributions of source code must retain the above copyright | 11 | * 1. Redistributions of source code must retain the above copyright | |
12 | * notice, this list of conditions and the following disclaimer. | 12 | * notice, this list of conditions and the following disclaimer. | |
13 | * 2. Redistributions in binary form must reproduce the above copyright | 13 | * 2. Redistributions in binary form must reproduce the above copyright | |
14 | * notice, this list of conditions and the following disclaimer in the | 14 | * notice, this list of conditions and the following disclaimer in the | |
15 | * documentation and/or other materials provided with the distribution. | 15 | * documentation and/or other materials provided with the distribution. | |
@@ -18,27 +18,27 @@ | @@ -18,27 +18,27 @@ | |||
18 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 18 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
19 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 19 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
20 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 20 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
21 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 21 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
22 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 22 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
23 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 23 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
24 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 24 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
25 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 25 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
26 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 26 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
27 | * POSSIBILITY OF SUCH DAMAGE. | 27 | * POSSIBILITY OF SUCH DAMAGE. | |
28 | */ | 28 | */ | |
29 | 29 | |||
30 | #include <sys/cdefs.h> | 30 | #include <sys/cdefs.h> | |
31 | __KERNEL_RCSID(0, "$NetBSD"); | 31 | __KERNEL_RCSID(0, "$NetBSD: at91pmc.c,v 1.7 2019/04/11 14:38:05 kamil Exp $"); | |
32 | 32 | |||
33 | #include <sys/types.h> | 33 | #include <sys/types.h> | |
34 | #include <sys/param.h> | 34 | #include <sys/param.h> | |
35 | #include <sys/systm.h> | 35 | #include <sys/systm.h> | |
36 | #include <sys/kernel.h> | 36 | #include <sys/kernel.h> | |
37 | #include <sys/time.h> | 37 | #include <sys/time.h> | |
38 | #include <sys/device.h> | 38 | #include <sys/device.h> | |
39 | 39 | |||
40 | #include <sys/bus.h> | 40 | #include <sys/bus.h> | |
41 | #include <machine/intr.h> | 41 | #include <machine/intr.h> | |
42 | 42 | |||
43 | #include <arm/cpufunc.h> | 43 | #include <arm/cpufunc.h> | |
44 | 44 |
--- src/sys/arch/arm/mpcore/Attic/mpcore_a2x_space.c 2018/03/16 17:56:32 1.3
+++ src/sys/arch/arm/mpcore/Attic/mpcore_a2x_space.c 2019/04/11 14:38:05 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD */ | 1 | /* $NetBSD: mpcore_a2x_space.c,v 1.4 2019/04/11 14:38:05 kamil Exp $ */ | |
2 | 2 | |||
3 | /* derived from: | 3 | /* derived from: | |
4 | NetBSD: pxa2x0_a4x_space.c,v 1.4 2006/07/28 08:15:29 simonb Exp */ | 4 | NetBSD: pxa2x0_a4x_space.c,v 1.4 2006/07/28 08:15:29 simonb Exp */ | |
5 | 5 | |||
6 | /* | 6 | /* | |
7 | * Copyright (c) 2002, 2010, 2011 Genetec Corporation. All rights reserved. | 7 | * Copyright (c) 2002, 2010, 2011 Genetec Corporation. All rights reserved. | |
8 | * Written by Hiroyuki Bessho for Genetec Corporation. | 8 | * Written by Hiroyuki Bessho for Genetec Corporation. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -25,27 +25,27 @@ | @@ -25,27 +25,27 @@ | |||
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | /* | 32 | /* | |
33 | * Bus space tag for 8/16-bit devices on 16-bit bus. | 33 | * Bus space tag for 8/16-bit devices on 16-bit bus. | |
34 | * all registers are located at the address of multiple of 2. | 34 | * all registers are located at the address of multiple of 2. | |
35 | */ | 35 | */ | |
36 | 36 | |||
37 | #include <sys/cdefs.h> | 37 | #include <sys/cdefs.h> | |
38 | __KERNEL_RCSID(0, "$NetBSD: mpcore_a2x_space.c,v 1.3 2018/03/16 17:56:32 ryo Exp $"); | 38 | __KERNEL_RCSID(0, "$NetBSD: mpcore_a2x_space.c,v 1.4 2019/04/11 14:38:05 kamil Exp $"); | |
39 | 39 | |||
40 | #include <sys/param.h> | 40 | #include <sys/param.h> | |
41 | #include <sys/systm.h> | 41 | #include <sys/systm.h> | |
42 | 42 | |||
43 | #include <uvm/uvm_extern.h> | 43 | #include <uvm/uvm_extern.h> | |
44 | 44 | |||
45 | #include <sys/bus.h> | 45 | #include <sys/bus.h> | |
46 | 46 | |||
47 | /* Prototypes for all the bus_space structure functions */ | 47 | /* Prototypes for all the bus_space structure functions */ | |
48 | bs_protos(mpcore); | 48 | bs_protos(mpcore); | |
49 | bs_protos(a2x); | 49 | bs_protos(a2x); | |
50 | bs_protos(generic); | 50 | bs_protos(generic); | |
51 | bs_protos(generic_armv4); | 51 | bs_protos(generic_armv4); |
--- src/sys/arch/evbppc/virtex/dev/cdmacreg.h 2006/12/02 22:18:47 1.1
+++ src/sys/arch/evbppc/virtex/dev/cdmacreg.h 2019/04/11 14:38:05 1.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD */ | 1 | /* $NetBSD: cdmacreg.h,v 1.2 2019/04/11 14:38:05 kamil Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2006 Jachym Holecek | 4 | * Copyright (c) 2006 Jachym Holecek | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written for DFC Design, s.r.o. | 7 | * Written for DFC Design, s.r.o. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * | 12 | * | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. |
--- src/sys/arch/evbppc/virtex/dev/temacvar.h 2006/12/02 22:18:47 1.1
+++ src/sys/arch/evbppc/virtex/dev/temacvar.h 2019/04/11 14:38:05 1.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD */ | 1 | /* $NetBSD: temacvar.h,v 1.2 2019/04/11 14:38:05 kamil Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2006 Jachym Holecek | 4 | * Copyright (c) 2006 Jachym Holecek | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written for "DSP&FPGA Custom Design". | 7 | * Written for "DSP&FPGA Custom Design". | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * | 12 | * | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. |
--- src/sys/arch/ia64/include/elf_machdep.h 2017/11/06 03:47:47 1.3
+++ src/sys/arch/ia64/include/elf_machdep.h 2019/04/11 14:38:06 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD */ | 1 | /* $NetBSD: elf_machdep.h,v 1.4 2019/04/11 14:38:06 kamil Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 1996-1997 John D. Polstra. | 4 | * Copyright (c) 1996-1997 John D. Polstra. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. |
--- src/sys/arch/m68k/m68k/sys_machdep.c 2010/06/06 04:50:07 1.15
+++ src/sys/arch/m68k/m68k/sys_machdep.c 2019/04/11 14:38:06 1.16
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sys_machdep.c,v 1.15 2010/06/06 04:50:07 mrg Exp $ */ | 1 | /* $NetBSD: sys_machdep.c,v 1.16 2019/04/11 14:38:06 kamil Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1982, 1986, 1993 | 4 | * Copyright (c) 1982, 1986, 1993 | |
5 | * The Regents of the University of California. All rights reserved. | 5 | * The Regents of the University of California. All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -24,27 +24,27 @@ | @@ -24,27 +24,27 @@ | |||
24 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 24 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
25 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 25 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
26 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 26 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
27 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 27 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
29 | * SUCH DAMAGE. | 29 | * SUCH DAMAGE. | |
30 | * | 30 | * | |
31 | * @(#)sys_machdep.c 8.2 (Berkeley) 1/13/94 | 31 | * @(#)sys_machdep.c 8.2 (Berkeley) 1/13/94 | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #include "opt_m68k_arch.h" | 34 | #include "opt_m68k_arch.h" | |
35 | 35 | |||
36 | #include <sys/cdefs.h> | 36 | #include <sys/cdefs.h> | |
37 | __KERNEL_RCSID(0, "$NetBSD"); | 37 | __KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.16 2019/04/11 14:38:06 kamil Exp $"); | |
38 | 38 | |||
39 | #include <sys/param.h> | 39 | #include <sys/param.h> | |
40 | #include <sys/proc.h> | 40 | #include <sys/proc.h> | |
41 | #include <sys/mount.h> | 41 | #include <sys/mount.h> | |
42 | 42 | |||
43 | #include <uvm/uvm_extern.h> | 43 | #include <uvm/uvm_extern.h> | |
44 | 44 | |||
45 | #include <sys/syscallargs.h> | 45 | #include <sys/syscallargs.h> | |
46 | 46 | |||
47 | #include <machine/cpu.h> | 47 | #include <machine/cpu.h> | |
48 | #include <m68k/cacheops.h> | 48 | #include <m68k/cacheops.h> | |
49 | 49 | |||
50 | /* XXX should be in an include file somewhere */ | 50 | /* XXX should be in an include file somewhere */ |
--- src/sys/arch/mips/alchemy/au1000.c 2015/06/09 22:50:50 1.11
+++ src/sys/arch/mips/alchemy/au1000.c 2019/04/11 14:38:06 1.12
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: au1000.c,v 1.11 2015/06/09 22:50:50 matt Exp $ */ | 1 | /* $NetBSD: au1000.c,v 1.12 2019/04/11 14:38:06 kamil Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2006 Itronix Inc. | 4 | * Copyright (c) 2006 Itronix Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Garrett D'Amore for Itronix Inc. | 7 | * Written by Garrett D'Amore for Itronix Inc. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright | |
@@ -87,27 +87,27 @@ | @@ -87,27 +87,27 @@ | |||
87 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 87 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
88 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 88 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
89 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 89 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
90 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 90 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
91 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 91 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
92 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 92 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
93 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 93 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
94 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 94 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
95 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 95 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
96 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 96 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
97 | */ | 97 | */ | |
98 | 98 | |||
99 | #include <sys/cdefs.h> | 99 | #include <sys/cdefs.h> | |
100 | __KERNEL_RCSID(0, "$NetBSD"); | 100 | __KERNEL_RCSID(0, "$NetBSD: au1000.c,v 1.12 2019/04/11 14:38:06 kamil Exp $"); | |
101 | 101 | |||
102 | #include <sys/param.h> | 102 | #include <sys/param.h> | |
103 | #include <sys/bus.h> | 103 | #include <sys/bus.h> | |
104 | #include <sys/cpu.h> | 104 | #include <sys/cpu.h> | |
105 | 105 | |||
106 | #include <mips/locore.h> | 106 | #include <mips/locore.h> | |
107 | #include <mips/alchemy/include/aureg.h> | 107 | #include <mips/alchemy/include/aureg.h> | |
108 | #include <mips/alchemy/include/auvar.h> | 108 | #include <mips/alchemy/include/auvar.h> | |
109 | 109 | |||
110 | static const char * const au1000_irqnames[] = { | 110 | static const char * const au1000_irqnames[] = { | |
111 | "uart0", | 111 | "uart0", | |
112 | "uart1", | 112 | "uart1", | |
113 | "uart2", | 113 | "uart2", |
--- src/sys/arch/riscv/conf/std.riscv64 2015/03/28 16:13:56 1.1
+++ src/sys/arch/riscv/conf/std.riscv64 2019/04/11 14:38:06 1.2
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | # | 1 | # | |
2 | # $NetBSD | 2 | # $NetBSD: std.riscv64,v 1.2 2019/04/11 14:38:06 kamil Exp $ | |
3 | # | 3 | # | |
4 | include "arch/riscv/conf/std.riscv" | 4 | include "arch/riscv/conf/std.riscv" | |
5 | makeoptions LP64="yes" | 5 | makeoptions LP64="yes" |
--- src/sys/dev/pci/if_bnxvar.h 2019/04/05 07:15:26 1.10
+++ src/sys/dev/pci/if_bnxvar.h 2019/04/11 14:38:06 1.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD */ | 1 | /* $NetBSD: if_bnxvar.h,v 1.11 2019/04/11 14:38:06 kamil Exp $ */ | |
2 | /*- | 2 | /*- | |
3 | * Copyright (c) 2010 The NetBSD Foundation, Inc. | 3 | * Copyright (c) 2010 The NetBSD Foundation, Inc. | |
4 | * All rights reserved. | 4 | * All rights reserved. | |
5 | * | 5 | * | |
6 | * This code is derived from software contributed to The NetBSD Foundation | 6 | * This code is derived from software contributed to The NetBSD Foundation | |
7 | * by Jean-Yves Migeon <jym@NetBSD.org> | 7 | * by Jean-Yves Migeon <jym@NetBSD.org> | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright |
--- src/sys/dev/pci/cxgb/cxgb_include.h 2010/03/21 21:11:13 1.1
+++ src/sys/dev/pci/cxgb/cxgb_include.h 2019/04/11 14:38:06 1.2
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | /* | 1 | /* | |
2 | * $NetBSD | 2 | * $NetBSD: cxgb_include.h,v 1.2 2019/04/11 14:38:06 kamil Exp $ | |
3 | */ | 3 | */ | |
4 | 4 | |||
5 | #ifndef __CHELSIO_INCLUDE_H | 5 | #ifndef __CHELSIO_INCLUDE_H | |
6 | #define __CHELSIO_INCLUDE_H | 6 | #define __CHELSIO_INCLUDE_H | |
7 | 7 | |||
8 | #include "cxgb_osdep.h" | 8 | #include "cxgb_osdep.h" | |
9 | #include "cxgb_mbuf.h" | 9 | #include "cxgb_mbuf.h" | |
10 | #include "cxgb_common.h" | 10 | #include "cxgb_common.h" | |
11 | #include "cxgb_ioctl.h" | 11 | #include "cxgb_ioctl.h" | |
12 | #include "cxgb_offload.h" | 12 | #include "cxgb_offload.h" | |
13 | #include "cxgb_regs.h" | 13 | #include "cxgb_regs.h" | |
14 | #include "cxgb_t3_cpl.h" | 14 | #include "cxgb_t3_cpl.h" | |
15 | #include "cxgb_ctl_defs.h" | 15 | #include "cxgb_ctl_defs.h" |
--- src/sys/net/npf/npf_rproc.c 2018/09/29 14:41:36 1.17
+++ src/sys/net/npf/npf_rproc.c 2019/04/11 14:38:06 1.18
@@ -23,27 +23,27 @@ | @@ -23,27 +23,27 @@ | |||
23 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 23 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
24 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 24 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
25 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 25 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
26 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 26 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
27 | * POSSIBILITY OF SUCH DAMAGE. | 27 | * POSSIBILITY OF SUCH DAMAGE. | |
28 | */ | 28 | */ | |
29 | 29 | |||
30 | /* | 30 | /* | |
31 | * NPF extension and rule procedure interface. | 31 | * NPF extension and rule procedure interface. | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #ifdef _KERNEL | 34 | #ifdef _KERNEL | |
35 | #include <sys/cdefs.h> | 35 | #include <sys/cdefs.h> | |
36 | __KERNEL_RCSID(0, "$NetBSD"); | 36 | __KERNEL_RCSID(0, "$NetBSD: npf_rproc.c,v 1.18 2019/04/11 14:38:06 kamil Exp $"); | |
37 | 37 | |||
38 | #include <sys/param.h> | 38 | #include <sys/param.h> | |
39 | #include <sys/types.h> | 39 | #include <sys/types.h> | |
40 | 40 | |||
41 | #include <sys/atomic.h> | 41 | #include <sys/atomic.h> | |
42 | #include <sys/kmem.h> | 42 | #include <sys/kmem.h> | |
43 | #include <sys/mutex.h> | 43 | #include <sys/mutex.h> | |
44 | #include <sys/module.h> | 44 | #include <sys/module.h> | |
45 | #endif | 45 | #endif | |
46 | 46 | |||
47 | #include "npf_impl.h" | 47 | #include "npf_impl.h" | |
48 | 48 | |||
49 | #define EXT_NAME_LEN 32 | 49 | #define EXT_NAME_LEN 32 |
--- src/sys/rump/net/lib/libvlan/VLAN.ioconf 2016/11/26 03:17:58 1.1
+++ src/sys/rump/net/lib/libvlan/VLAN.ioconf 2019/04/11 14:38:06 1.2
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | # $NetBSD $ | 1 | # $NetBSD: VLAN.ioconf,v 1.2 2019/04/11 14:38:06 kamil Exp $ | |
2 | 2 | |||
3 | ioconf vlan | 3 | ioconf vlan | |
4 | 4 | |||
5 | include "conf/files" | 5 | include "conf/files" | |
6 | 6 | |||
7 | pseudo-device vlan | 7 | pseudo-device vlan |