need <sys/param.h> for COHERENCY_UNIT Minor KNF along the way.diff -r1.10 -r1.11 src/sys/compat/common/tty_60.c
(skrll)
--- src/sys/compat/common/tty_60.c 2020/06/24 17:47:52 1.10
+++ src/sys/compat/common/tty_60.c 2021/07/21 06:35:44 1.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: tty_60.c,v 1.10 2020/06/24 17:47:52 jdolecek Exp $ */ | 1 | /* $NetBSD: tty_60.c,v 1.11 2021/07/21 06:35:44 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2012 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2012 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Alan Barrett | 8 | * by Alan Barrett | |
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. | |
@@ -20,32 +20,33 @@ | @@ -20,32 +20,33 @@ | |||
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
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 | #include <sys/cdefs.h> | 32 | #include <sys/cdefs.h> | |
33 | __KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.10 2020/06/24 17:47:52 jdolecek Exp $"); | 33 | __KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.11 2021/07/21 06:35:44 skrll Exp $"); | |
34 | 34 | |||
35 | #if defined(_KERNEL_OPT) | 35 | #if defined(_KERNEL_OPT) | |
36 | #include "opt_compat_netbsd.h" | 36 | #include "opt_compat_netbsd.h" | |
37 | #endif | 37 | #endif | |
38 | 38 | |||
39 | #include <sys/param.h> | |||
39 | #include <sys/types.h> | 40 | #include <sys/types.h> | |
40 | 41 | |||
41 | #include <sys/conf.h> | 42 | #include <sys/conf.h> | |
42 | #include <sys/errno.h> | 43 | #include <sys/errno.h> | |
43 | #include <sys/systm.h> | 44 | #include <sys/systm.h> | |
44 | #include <sys/compat_stub.h> | 45 | #include <sys/compat_stub.h> | |
45 | #include <sys/kmem.h> | 46 | #include <sys/kmem.h> | |
46 | 47 | |||
47 | #include <sys/tty.h> | 48 | #include <sys/tty.h> | |
48 | 49 | |||
49 | #include <compat/common/compat_mod.h> | 50 | #include <compat/common/compat_mod.h> | |
50 | #include <compat/sys/ttycom.h> | 51 | #include <compat/sys/ttycom.h> | |
51 | 52 |
--- src/sys/dev/audio/alaw.c 2020/01/11 04:06:13 1.3
+++ src/sys/dev/audio/alaw.c 2021/07/21 06:35:44 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: alaw.c,v 1.3 2020/01/11 04:06:13 isaki Exp $ */ | 1 | /* $NetBSD: alaw.c,v 1.4 2021/07/21 06:35:44 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (C) 2018 Tetsuya Isaki. All rights reserved. | 4 | * Copyright (C) 2018 Tetsuya Isaki. All rights reserved. | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * | 14 | * | |
@@ -16,28 +16,29 @@ | @@ -16,28 +16,29 @@ | |||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | 19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | |
20 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 20 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |
21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | 21 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | |
22 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 22 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
23 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 23 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
24 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 24 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
25 | * SUCH DAMAGE. | 25 | * SUCH DAMAGE. | |
26 | */ | 26 | */ | |
27 | 27 | |||
28 | #include <sys/cdefs.h> | 28 | #include <sys/cdefs.h> | |
29 | __KERNEL_RCSID(0, "$NetBSD: alaw.c,v 1.3 2020/01/11 04:06:13 isaki Exp $"); | 29 | __KERNEL_RCSID(0, "$NetBSD: alaw.c,v 1.4 2021/07/21 06:35:44 skrll Exp $"); | |
30 | 30 | |||
31 | #include <sys/param.h> | |||
31 | #include <sys/types.h> | 32 | #include <sys/types.h> | |
32 | #include <sys/systm.h> | 33 | #include <sys/systm.h> | |
33 | #include <sys/device.h> | 34 | #include <sys/device.h> | |
34 | #include <dev/audio/audiovar.h> | 35 | #include <dev/audio/audiovar.h> | |
35 | #include <dev/audio/mulaw.h> | 36 | #include <dev/audio/mulaw.h> | |
36 | 37 | |||
37 | static const uint16_t alaw_to_slinear16[256] = { | 38 | static const uint16_t alaw_to_slinear16[256] = { | |
38 | 0xea80, 0xeb80, 0xe880, 0xe980, 0xee80, 0xef80, 0xec80, 0xed80, | 39 | 0xea80, 0xeb80, 0xe880, 0xe980, 0xee80, 0xef80, 0xec80, 0xed80, | |
39 | 0xe280, 0xe380, 0xe080, 0xe180, 0xe680, 0xe780, 0xe480, 0xe580, | 40 | 0xe280, 0xe380, 0xe080, 0xe180, 0xe680, 0xe780, 0xe480, 0xe580, | |
40 | 0xf540, 0xf5c0, 0xf440, 0xf4c0, 0xf740, 0xf7c0, 0xf640, 0xf6c0, | 41 | 0xf540, 0xf5c0, 0xf440, 0xf4c0, 0xf740, 0xf7c0, 0xf640, 0xf6c0, | |
41 | 0xf140, 0xf1c0, 0xf040, 0xf0c0, 0xf340, 0xf3c0, 0xf240, 0xf2c0, | 42 | 0xf140, 0xf1c0, 0xf040, 0xf0c0, 0xf340, 0xf3c0, 0xf240, 0xf2c0, | |
42 | 0xaa00, 0xae00, 0xa200, 0xa600, 0xba00, 0xbe00, 0xb200, 0xb600, | 43 | 0xaa00, 0xae00, 0xa200, 0xa600, 0xba00, 0xbe00, 0xb200, 0xb600, | |
43 | 0x8a00, 0x8e00, 0x8200, 0x8600, 0x9a00, 0x9e00, 0x9200, 0x9600, | 44 | 0x8a00, 0x8e00, 0x8200, 0x8600, 0x9a00, 0x9e00, 0x9200, 0x9600, |
--- src/sys/dev/audio/linear.c 2020/01/11 04:06:13 1.3
+++ src/sys/dev/audio/linear.c 2021/07/21 06:35:44 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: linear.c,v 1.3 2020/01/11 04:06:13 isaki Exp $ */ | 1 | /* $NetBSD: linear.c,v 1.4 2021/07/21 06:35:44 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. | 4 | * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. | |
5 | * Copyright (C) 2017 Y.Sugahara (moveccr). All rights reserved. | 5 | * Copyright (C) 2017 Y.Sugahara (moveccr). 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. | |
@@ -17,28 +17,29 @@ | @@ -17,28 +17,29 @@ | |||
17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | 20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | |
21 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | |
23 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 23 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
24 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 24 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
25 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 25 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
26 | * SUCH DAMAGE. | 26 | * SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | 29 | #include <sys/cdefs.h> | |
30 | __KERNEL_RCSID(0, "$NetBSD: linear.c,v 1.3 2020/01/11 04:06:13 isaki Exp $"); | 30 | __KERNEL_RCSID(0, "$NetBSD: linear.c,v 1.4 2021/07/21 06:35:44 skrll Exp $"); | |
31 | 31 | |||
32 | #include <sys/param.h> | |||
32 | #include <sys/types.h> | 33 | #include <sys/types.h> | |
33 | #include <sys/systm.h> | 34 | #include <sys/systm.h> | |
34 | #include <sys/device.h> | 35 | #include <sys/device.h> | |
35 | #include <dev/audio/audiovar.h> | 36 | #include <dev/audio/audiovar.h> | |
36 | #include <dev/audio/linear.h> | 37 | #include <dev/audio/linear.h> | |
37 | 38 | |||
38 | /* | 39 | /* | |
39 | * audio_linear8_to_internal: | 40 | * audio_linear8_to_internal: | |
40 | * This filter performs conversion from [US]LINEAR8 to internal format. | 41 | * This filter performs conversion from [US]LINEAR8 to internal format. | |
41 | */ | 42 | */ | |
42 | void | 43 | void | |
43 | audio_linear8_to_internal(audio_filter_arg_t *arg) | 44 | audio_linear8_to_internal(audio_filter_arg_t *arg) | |
44 | { | 45 | { |
--- src/sys/dev/audio/audiobell.c 2021/03/20 04:56:52 1.4
+++ src/sys/dev/audio/audiobell.c 2021/07/21 06:35:44 1.5
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: audiobell.c,v 1.4 2021/03/20 04:56:52 isaki Exp $ */ | 1 | /* $NetBSD: audiobell.c,v 1.5 2021/07/21 06:35:44 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1999 Richard Earnshaw | 4 | * Copyright (c) 1999 Richard Earnshaw | |
5 | * Copyright (c) 2004 Ben Harris | 5 | * Copyright (c) 2004 Ben Harris | |
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. | |
@@ -20,29 +20,31 @@ | @@ -20,29 +20,31 @@ | |||
20 | * | 20 | * | |
21 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 21 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
22 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 22 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
23 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 23 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
24 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 24 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
25 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 25 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
26 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 26 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
27 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 27 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
28 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 28 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
29 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 29 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
30 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
31 | */ | 31 | */ | |
32 | 32 | |||
33 | #include <sys/types.h> | 33 | #include <sys/cdefs.h> | |
34 | __KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.4 2021/03/20 04:56:52 isaki Exp $"); | 34 | __KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.5 2021/07/21 06:35:44 skrll Exp $"); | |
35 | 35 | |||
36 | #include <sys/param.h> | |||
37 | #include <sys/types.h> | |||
36 | #include <sys/audioio.h> | 38 | #include <sys/audioio.h> | |
37 | #include <sys/conf.h> | 39 | #include <sys/conf.h> | |
38 | #include <sys/device.h> | 40 | #include <sys/device.h> | |
39 | #include <sys/malloc.h> | 41 | #include <sys/malloc.h> | |
40 | #include <sys/systm.h> | 42 | #include <sys/systm.h> | |
41 | #include <sys/uio.h> | 43 | #include <sys/uio.h> | |
42 | 44 | |||
43 | #include <dev/audio/audio_if.h> | 45 | #include <dev/audio/audio_if.h> | |
44 | #include <dev/audio/audiovar.h> | 46 | #include <dev/audio/audiovar.h> | |
45 | #include <dev/audio/audiodef.h> | 47 | #include <dev/audio/audiodef.h> | |
46 | #include <dev/audio/audiobellvar.h> | 48 | #include <dev/audio/audiobellvar.h> | |
47 | 49 | |||
48 | /* | 50 | /* |
--- src/sys/dev/audio/mulaw.c 2020/09/12 06:09:16 1.4
+++ src/sys/dev/audio/mulaw.c 2021/07/21 06:35:44 1.5
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: mulaw.c,v 1.4 2020/09/12 06:09:16 isaki Exp $ */ | 1 | /* $NetBSD: mulaw.c,v 1.5 2021/07/21 06:35:44 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. | 4 | * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. | |
5 | * Copyright (C) 2017 Y.Sugahara (moveccr). All rights reserved. | 5 | * Copyright (C) 2017 Y.Sugahara (moveccr). 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. | |
@@ -17,28 +17,29 @@ | @@ -17,28 +17,29 @@ | |||
17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | 20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | |
21 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | |
23 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 23 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
24 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 24 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
25 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 25 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
26 | * SUCH DAMAGE. | 26 | * SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | 29 | #include <sys/cdefs.h> | |
30 | __KERNEL_RCSID(0, "$NetBSD: mulaw.c,v 1.4 2020/09/12 06:09:16 isaki Exp $"); | 30 | __KERNEL_RCSID(0, "$NetBSD: mulaw.c,v 1.5 2021/07/21 06:35:44 skrll Exp $"); | |
31 | 31 | |||
32 | #include <sys/param.h> | |||
32 | #include <sys/types.h> | 33 | #include <sys/types.h> | |
33 | #include <sys/systm.h> | 34 | #include <sys/systm.h> | |
34 | #include <sys/device.h> | 35 | #include <sys/device.h> | |
35 | #include <dev/audio/audiovar.h> | 36 | #include <dev/audio/audiovar.h> | |
36 | #include <dev/audio/mulaw.h> | 37 | #include <dev/audio/mulaw.h> | |
37 | 38 | |||
38 | /* | 39 | /* | |
39 | * audio_internal_to_mulaw has two implementations. | 40 | * audio_internal_to_mulaw has two implementations. | |
40 | * | 41 | * | |
41 | * 1. Use 8bit table (MULAW_LQ_ENC) | 42 | * 1. Use 8bit table (MULAW_LQ_ENC) | |
42 | * It's traditional implementation and its precision is 8bit. | 43 | * It's traditional implementation and its precision is 8bit. | |
43 | * It's faster but the size is larger. And you can hear a little noise | 44 | * It's faster but the size is larger. And you can hear a little noise | |
44 | * in silent part. | 45 | * in silent part. |
--- src/sys/dev/hid/hidkbdmap.c 2021/05/11 10:16:48 1.13
+++ src/sys/dev/hid/hidkbdmap.c 2021/07/21 06:35:45 1.14
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: hidkbdmap.c,v 1.13 2021/05/11 10:16:48 nia Exp $ */ | 1 | /* $NetBSD: hidkbdmap.c,v 1.14 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1999,2001 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1999,2001 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Lennart Augustsson (lennart@augustsson.net) at | 8 | * by Lennart Augustsson (lennart@augustsson.net) at | |
9 | * Carlstedt Research & Technology. | 9 | * Carlstedt Research & Technology. | |
10 | * | 10 | * | |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without | |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions | |
13 | * are met: | 13 | * are met: | |
14 | * 1. Redistributions of source code must retain the above copyright | 14 | * 1. Redistributions of source code must retain the above copyright | |
@@ -21,28 +21,29 @@ | @@ -21,28 +21,29 @@ | |||
21 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 21 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
22 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 22 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
23 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 23 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
24 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
25 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
26 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
27 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 27 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
28 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 28 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
29 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 29 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
30 | * POSSIBILITY OF SUCH DAMAGE. | 30 | * POSSIBILITY OF SUCH DAMAGE. | |
31 | */ | 31 | */ | |
32 | 32 | |||
33 | #include <sys/cdefs.h> | 33 | #include <sys/cdefs.h> | |
34 | __KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.13 2021/05/11 10:16:48 nia Exp $"); | 34 | __KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.14 2021/07/21 06:35:45 skrll Exp $"); | |
35 | 35 | |||
36 | #include <sys/param.h> | |||
36 | #include <sys/types.h> | 37 | #include <sys/types.h> | |
37 | #include <dev/wscons/wsksymdef.h> | 38 | #include <dev/wscons/wsksymdef.h> | |
38 | #include <dev/wscons/wsksymvar.h> | 39 | #include <dev/wscons/wsksymvar.h> | |
39 | 40 | |||
40 | #include <dev/usb/usb.h> | 41 | #include <dev/usb/usb.h> | |
41 | 42 | |||
42 | #define KC(n) KS_KEYCODE(n) | 43 | #define KC(n) KS_KEYCODE(n) | |
43 | 44 | |||
44 | Static const keysym_t hidkbd_keydesc_us[] = { | 45 | Static const keysym_t hidkbd_keydesc_us[] = { | |
45 | /* pos command normal shifted */ | 46 | /* pos command normal shifted */ | |
46 | KC(4), KS_a, | 47 | KC(4), KS_a, | |
47 | KC(5), KS_b, | 48 | KC(5), KS_b, | |
48 | KC(6), KS_c, | 49 | KC(6), KS_c, |
--- src/sys/dev/usb/usbroothub.c 2019/08/21 10:48:37 1.9
+++ src/sys/dev/usb/usbroothub.c 2021/07/21 06:35:45 1.10
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: usbroothub.c,v 1.9 2019/08/21 10:48:37 mrg Exp $ */ | 1 | /* $NetBSD: usbroothub.c,v 1.10 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Lennart Augustsson (lennart@augustsson.net) at | 8 | * by Lennart Augustsson (lennart@augustsson.net) at | |
9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca), | 9 | * Carlstedt Research & Technology, Jared D. McNeill (jmcneill@invisible.ca), | |
10 | * Matthew R. Green (mrg@eterna.com.au) and Nick Hudson. | 10 | * Matthew R. Green (mrg@eterna.com.au) and Nick Hudson. | |
11 | * | 11 | * | |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without | |
13 | * modification, are permitted provided that the following conditions | 13 | * modification, are permitted provided that the following conditions | |
14 | * are met: | 14 | * are met: | |
@@ -48,34 +48,36 @@ | @@ -48,34 +48,36 @@ | |||
48 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 48 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
49 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 49 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
50 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 50 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
51 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 51 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
52 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 52 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
53 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 53 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
54 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 54 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
55 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 55 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
56 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 56 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
57 | * | 57 | * | |
58 | */ | 58 | */ | |
59 | 59 | |||
60 | #include <sys/cdefs.h> | 60 | #include <sys/cdefs.h> | |
61 | __KERNEL_RCSID(0, "$NetBSD: usbroothub.c,v 1.9 2019/08/21 10:48:37 mrg Exp $"); | 61 | __KERNEL_RCSID(0, "$NetBSD: usbroothub.c,v 1.10 2021/07/21 06:35:45 skrll Exp $"); | |
62 | ||||
63 | #include <sys/param.h> | |||
64 | #include <sys/systm.h> /* for ostype */ | |||
62 | 65 | |||
63 | #include <dev/usb/usb.h> | 66 | #include <dev/usb/usb.h> | |
64 | #include <dev/usb/usbdi.h> | 67 | #include <dev/usb/usbdi.h> | |
65 | #include <dev/usb/usbdivar.h> | 68 | #include <dev/usb/usbdivar.h> | |
66 | #include <dev/usb/usbroothub.h> | 69 | #include <dev/usb/usbroothub.h> | |
67 | #include <dev/usb/usbhist.h> | 70 | #include <dev/usb/usbhist.h> | |
68 | #include <sys/systm.h> /* for ostype */ | |||
69 | 71 | |||
70 | extern int usbdebug; | 72 | extern int usbdebug; | |
71 | 73 | |||
72 | /* helper functions for USB root hub emulation */ | 74 | /* helper functions for USB root hub emulation */ | |
73 | 75 | |||
74 | static usbd_status roothub_ctrl_transfer(struct usbd_xfer *); | 76 | static usbd_status roothub_ctrl_transfer(struct usbd_xfer *); | |
75 | static usbd_status roothub_ctrl_start(struct usbd_xfer *); | 77 | static usbd_status roothub_ctrl_start(struct usbd_xfer *); | |
76 | static void roothub_ctrl_abort(struct usbd_xfer *); | 78 | static void roothub_ctrl_abort(struct usbd_xfer *); | |
77 | static void roothub_ctrl_close(struct usbd_pipe *); | 79 | static void roothub_ctrl_close(struct usbd_pipe *); | |
78 | static void roothub_ctrl_done(struct usbd_xfer *); | 80 | static void roothub_ctrl_done(struct usbd_xfer *); | |
79 | static void roothub_noop(struct usbd_pipe *pipe); | 81 | static void roothub_noop(struct usbd_pipe *pipe); | |
80 | 82 | |||
81 | const struct usbd_pipe_methods roothub_ctrl_methods = { | 83 | const struct usbd_pipe_methods roothub_ctrl_methods = { |
--- src/sys/kern/subr_cprng.c 2020/05/11 21:40:12 1.40
+++ src/sys/kern/subr_cprng.c 2021/07/21 06:35:45 1.41
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: subr_cprng.c,v 1.40 2020/05/11 21:40:12 riastradh Exp $ */ | 1 | /* $NetBSD: subr_cprng.c,v 1.41 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2019 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2019 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Taylor R. Campbell. | 8 | * by Taylor R. Campbell. | |
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. | |
@@ -42,28 +42,29 @@ | @@ -42,28 +42,29 @@ | |||
42 | * 3. /dev/random | 42 | * 3. /dev/random | |
43 | * | 43 | * | |
44 | * This code serves the first two categories without having extra | 44 | * This code serves the first two categories without having extra | |
45 | * logic for /dev/random. | 45 | * logic for /dev/random. | |
46 | * | 46 | * | |
47 | * kern_cprng - available at IPL_VM or lower | 47 | * kern_cprng - available at IPL_VM or lower | |
48 | * user_cprng - available only at IPL_NONE in thread context | 48 | * user_cprng - available only at IPL_NONE in thread context | |
49 | * | 49 | * | |
50 | * The name kern_cprng is for hysterical raisins. The name | 50 | * The name kern_cprng is for hysterical raisins. The name | |
51 | * user_cprng serves only to contrast with kern_cprng. | 51 | * user_cprng serves only to contrast with kern_cprng. | |
52 | */ | 52 | */ | |
53 | 53 | |||
54 | #include <sys/cdefs.h> | 54 | #include <sys/cdefs.h> | |
55 | __KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.40 2020/05/11 21:40:12 riastradh Exp $"); | 55 | __KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.41 2021/07/21 06:35:45 skrll Exp $"); | |
56 | 56 | |||
57 | #include <sys/param.h> | |||
57 | #include <sys/types.h> | 58 | #include <sys/types.h> | |
58 | #include <sys/cprng.h> | 59 | #include <sys/cprng.h> | |
59 | #include <sys/cpu.h> | 60 | #include <sys/cpu.h> | |
60 | #include <sys/entropy.h> | 61 | #include <sys/entropy.h> | |
61 | #include <sys/errno.h> | 62 | #include <sys/errno.h> | |
62 | #include <sys/evcnt.h> | 63 | #include <sys/evcnt.h> | |
63 | #include <sys/intr.h> | 64 | #include <sys/intr.h> | |
64 | #include <sys/kmem.h> | 65 | #include <sys/kmem.h> | |
65 | #include <sys/percpu.h> | 66 | #include <sys/percpu.h> | |
66 | #include <sys/sysctl.h> | 67 | #include <sys/sysctl.h> | |
67 | #include <sys/systm.h> | 68 | #include <sys/systm.h> | |
68 | 69 | |||
69 | #include <crypto/nist_hash_drbg/nist_hash_drbg.h> | 70 | #include <crypto/nist_hash_drbg/nist_hash_drbg.h> |
--- src/sys/kern/subr_psref.c 2021/06/02 09:23:32 1.14
+++ src/sys/kern/subr_psref.c 2021/07/21 06:35:45 1.15
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: subr_psref.c,v 1.14 2021/06/02 09:23:32 riastradh Exp $ */ | 1 | /* $NetBSD: subr_psref.c,v 1.15 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2016 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2016 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Taylor R. Campbell. | 8 | * by Taylor R. Campbell. | |
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. | |
@@ -54,28 +54,29 @@ | @@ -54,28 +54,29 @@ | |||
54 | * - If you need references to transfer from CPU to CPU or LWP to | 54 | * - If you need references to transfer from CPU to CPU or LWP to | |
55 | * LWP, or if you need long-term references, you must use | 55 | * LWP, or if you need long-term references, you must use | |
56 | * reference counting, e.g. with atomic operations or locks, | 56 | * reference counting, e.g. with atomic operations or locks, | |
57 | * which incurs interprocessor synchronization for every use -- | 57 | * which incurs interprocessor synchronization for every use -- | |
58 | * cheaper than an xcall, but not scalable. | 58 | * cheaper than an xcall, but not scalable. | |
59 | * | 59 | * | |
60 | * - If all users *guarantee* that they will not sleep, then it is | 60 | * - If all users *guarantee* that they will not sleep, then it is | |
61 | * not necessary to use passive references: you may as well just | 61 | * not necessary to use passive references: you may as well just | |
62 | * use the even cheaper pserialize(9), because you have | 62 | * use the even cheaper pserialize(9), because you have | |
63 | * satisfied the requirements of a pserialize read section. | 63 | * satisfied the requirements of a pserialize read section. | |
64 | */ | 64 | */ | |
65 | 65 | |||
66 | #include <sys/cdefs.h> | 66 | #include <sys/cdefs.h> | |
67 | __KERNEL_RCSID(0, "$NetBSD: subr_psref.c,v 1.14 2021/06/02 09:23:32 riastradh Exp $"); | 67 | __KERNEL_RCSID(0, "$NetBSD: subr_psref.c,v 1.15 2021/07/21 06:35:45 skrll Exp $"); | |
68 | 68 | |||
69 | #include <sys/param.h> | |||
69 | #include <sys/types.h> | 70 | #include <sys/types.h> | |
70 | #include <sys/condvar.h> | 71 | #include <sys/condvar.h> | |
71 | #include <sys/cpu.h> | 72 | #include <sys/cpu.h> | |
72 | #include <sys/intr.h> | 73 | #include <sys/intr.h> | |
73 | #include <sys/kmem.h> | 74 | #include <sys/kmem.h> | |
74 | #include <sys/lwp.h> | 75 | #include <sys/lwp.h> | |
75 | #include <sys/mutex.h> | 76 | #include <sys/mutex.h> | |
76 | #include <sys/percpu.h> | 77 | #include <sys/percpu.h> | |
77 | #include <sys/psref.h> | 78 | #include <sys/psref.h> | |
78 | #include <sys/queue.h> | 79 | #include <sys/queue.h> | |
79 | #include <sys/xcall.h> | 80 | #include <sys/xcall.h> | |
80 | #include <sys/lwp.h> | 81 | #include <sys/lwp.h> | |
81 | 82 |
--- src/sys/kern/sys_futex.c 2020/05/05 15:25:18 1.11
+++ src/sys/kern/sys_futex.c 2021/07/21 06:35:45 1.12
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sys_futex.c,v 1.11 2020/05/05 15:25:18 riastradh Exp $ */ | 1 | /* $NetBSD: sys_futex.c,v 1.12 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Taylor R. Campbell and Jason R. Thorpe. | 8 | * by Taylor R. Campbell and Jason R. Thorpe. | |
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. | |
@@ -20,27 +20,27 @@ | @@ -20,27 +20,27 @@ | |||
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
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 | #include <sys/cdefs.h> | 32 | #include <sys/cdefs.h> | |
33 | __KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.11 2020/05/05 15:25:18 riastradh Exp $"); | 33 | __KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.12 2021/07/21 06:35:45 skrll Exp $"); | |
34 | 34 | |||
35 | /* | 35 | /* | |
36 | * Futexes | 36 | * Futexes | |
37 | * | 37 | * | |
38 | * The futex system call coordinates notifying threads waiting for | 38 | * The futex system call coordinates notifying threads waiting for | |
39 | * changes on a 32-bit word of memory. The word can be managed by | 39 | * changes on a 32-bit word of memory. The word can be managed by | |
40 | * CPU atomic operations in userland, without system calls, as long | 40 | * CPU atomic operations in userland, without system calls, as long | |
41 | * as there is no contention. | 41 | * as there is no contention. | |
42 | * | 42 | * | |
43 | * The simplest use case demonstrating the utility is: | 43 | * The simplest use case demonstrating the utility is: | |
44 | * | 44 | * | |
45 | * // 32-bit word of memory shared among threads or | 45 | * // 32-bit word of memory shared among threads or | |
46 | * // processes in userland. lock & 1 means owned; | 46 | * // processes in userland. lock & 1 means owned; | |
@@ -104,26 +104,27 @@ __KERNEL_RCSID(0, "$NetBSD: sys_futex.c, | @@ -104,26 +104,27 @@ __KERNEL_RCSID(0, "$NetBSD: sys_futex.c, | |||
104 | * For now, we use a global red/black tree to index futexes. This | 104 | * For now, we use a global red/black tree to index futexes. This | |
105 | * should be replaced by a lockless radix tree with a thread to | 105 | * should be replaced by a lockless radix tree with a thread to | |
106 | * free entries no longer in use once all lookups on all CPUs have | 106 | * free entries no longer in use once all lookups on all CPUs have | |
107 | * completed. | 107 | * completed. | |
108 | * | 108 | * | |
109 | * Specifically, we maintain two maps: | 109 | * Specifically, we maintain two maps: | |
110 | * | 110 | * | |
111 | * futex_tab.va[vmspace, va] for private futexes | 111 | * futex_tab.va[vmspace, va] for private futexes | |
112 | * futex_tab.oa[uvm_voaddr] for shared futexes | 112 | * futex_tab.oa[uvm_voaddr] for shared futexes | |
113 | * | 113 | * | |
114 | * This implementation does not support priority inheritance. | 114 | * This implementation does not support priority inheritance. | |
115 | */ | 115 | */ | |
116 | 116 | |||
117 | #include <sys/param.h> | |||
117 | #include <sys/types.h> | 118 | #include <sys/types.h> | |
118 | #include <sys/atomic.h> | 119 | #include <sys/atomic.h> | |
119 | #include <sys/condvar.h> | 120 | #include <sys/condvar.h> | |
120 | #include <sys/futex.h> | 121 | #include <sys/futex.h> | |
121 | #include <sys/mutex.h> | 122 | #include <sys/mutex.h> | |
122 | #include <sys/rbtree.h> | 123 | #include <sys/rbtree.h> | |
123 | #include <sys/queue.h> | 124 | #include <sys/queue.h> | |
124 | 125 | |||
125 | #include <sys/syscall.h> | 126 | #include <sys/syscall.h> | |
126 | #include <sys/syscallargs.h> | 127 | #include <sys/syscallargs.h> | |
127 | #include <sys/syscallvar.h> | 128 | #include <sys/syscallvar.h> | |
128 | 129 | |||
129 | #include <uvm/uvm_extern.h> | 130 | #include <uvm/uvm_extern.h> |
--- src/sys/kern/vfs_cache.c 2020/12/12 18:41:13 1.149
+++ src/sys/kern/vfs_cache.c 2021/07/21 06:35:45 1.150
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: vfs_cache.c,v 1.149 2020/12/12 18:41:13 christos Exp $ */ | 1 | /* $NetBSD: vfs_cache.c,v 1.150 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Andrew Doran. | 8 | * by Andrew Doran. | |
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. | |
@@ -162,34 +162,35 @@ | @@ -162,34 +162,35 @@ | |||
162 | * | 162 | * | |
163 | * 1) vi->vi_nc_lock (tree or parent -> child direction, | 163 | * 1) vi->vi_nc_lock (tree or parent -> child direction, | |
164 | * used during forward lookup) | 164 | * used during forward lookup) | |
165 | * | 165 | * | |
166 | * 2) vi->vi_nc_listlock (list or child -> parent direction, | 166 | * 2) vi->vi_nc_listlock (list or child -> parent direction, | |
167 | * used during reverse lookup) | 167 | * used during reverse lookup) | |
168 | * | 168 | * | |
169 | * 3) cache_lru_lock (LRU list direction, used during reclaim) | 169 | * 3) cache_lru_lock (LRU list direction, used during reclaim) | |
170 | * | 170 | * | |
171 | * 4) vp->v_interlock (what the cache entry points to) | 171 | * 4) vp->v_interlock (what the cache entry points to) | |
172 | */ | 172 | */ | |
173 | 173 | |||
174 | #include <sys/cdefs.h> | 174 | #include <sys/cdefs.h> | |
175 | __KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.149 2020/12/12 18:41:13 christos Exp $"); | 175 | __KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.150 2021/07/21 06:35:45 skrll Exp $"); | |
176 | 176 | |||
177 | #define __NAMECACHE_PRIVATE | 177 | #define __NAMECACHE_PRIVATE | |
178 | #ifdef _KERNEL_OPT | 178 | #ifdef _KERNEL_OPT | |
179 | #include "opt_ddb.h" | 179 | #include "opt_ddb.h" | |
180 | #include "opt_dtrace.h" | 180 | #include "opt_dtrace.h" | |
181 | #endif | 181 | #endif | |
182 | 182 | |||
183 | #include <sys/param.h> | |||
183 | #include <sys/types.h> | 184 | #include <sys/types.h> | |
184 | #include <sys/atomic.h> | 185 | #include <sys/atomic.h> | |
185 | #include <sys/callout.h> | 186 | #include <sys/callout.h> | |
186 | #include <sys/cpu.h> | 187 | #include <sys/cpu.h> | |
187 | #include <sys/errno.h> | 188 | #include <sys/errno.h> | |
188 | #include <sys/evcnt.h> | 189 | #include <sys/evcnt.h> | |
189 | #include <sys/hash.h> | 190 | #include <sys/hash.h> | |
190 | #include <sys/kernel.h> | 191 | #include <sys/kernel.h> | |
191 | #include <sys/mount.h> | 192 | #include <sys/mount.h> | |
192 | #include <sys/mutex.h> | 193 | #include <sys/mutex.h> | |
193 | #include <sys/namei.h> | 194 | #include <sys/namei.h> | |
194 | #include <sys/param.h> | 195 | #include <sys/param.h> | |
195 | #include <sys/pool.h> | 196 | #include <sys/pool.h> |
--- src/sys/netatalk/at_print.c 2014/12/02 19:33:44 1.1
+++ src/sys/netatalk/at_print.c 2021/07/21 06:35:45 1.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: at_print.c,v 1.1 2014/12/02 19:33:44 christos Exp $ */ | 1 | /* $NetBSD: at_print.c,v 1.2 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2014 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2014 The NetBSD Foundation, Inc. | |
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. | |
@@ -17,32 +17,33 @@ | @@ -17,32 +17,33 @@ | |||
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | #include <sys/cdefs.h> | 28 | #include <sys/cdefs.h> | |
29 | 29 | |||
30 | #include <sys/param.h> | |||
30 | #include <sys/types.h> | 31 | #include <sys/types.h> | |
31 | #ifdef _KERNEL | 32 | #ifdef _KERNEL | |
32 | __KERNEL_RCSID(0, "$NetBSD: at_print.c,v 1.1 2014/12/02 19:33:44 christos Exp $"); | 33 | __KERNEL_RCSID(0, "$NetBSD: at_print.c,v 1.2 2021/07/21 06:35:45 skrll Exp $"); | |
33 | #include <sys/systm.h> | 34 | #include <sys/systm.h> | |
34 | #else | 35 | #else | |
35 | __RCSID("$NetBSD: at_print.c,v 1.1 2014/12/02 19:33:44 christos Exp $"); | 36 | __RCSID("$NetBSD: at_print.c,v 1.2 2021/07/21 06:35:45 skrll Exp $"); | |
36 | #include <stdio.h> | 37 | #include <stdio.h> | |
37 | #endif | 38 | #endif | |
38 | #include <netatalk/at.h> | 39 | #include <netatalk/at.h> | |
39 | 40 | |||
40 | int | 41 | int | |
41 | at_print(char *buf, size_t len, const struct at_addr *aa) | 42 | at_print(char *buf, size_t len, const struct at_addr *aa) | |
42 | { | 43 | { | |
43 | return snprintf(buf, len, "%hu.%hhu", ntohs(aa->s_net), aa->s_node); | 44 | return snprintf(buf, len, "%hu.%hhu", ntohs(aa->s_net), aa->s_node); | |
44 | } | 45 | } | |
45 | 46 | |||
46 | // XXX: netrange | 47 | // XXX: netrange | |
47 | int | 48 | int | |
48 | sat_print(char *buf, size_t len, const void *v) | 49 | sat_print(char *buf, size_t len, const void *v) |
--- src/sys/uvm/uvm_mmap.c 2020/02/23 15:46:43 1.175
+++ src/sys/uvm/uvm_mmap.c 2021/07/21 06:35:45 1.176
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: uvm_mmap.c,v 1.175 2020/02/23 15:46:43 ad Exp $ */ | 1 | /* $NetBSD: uvm_mmap.c,v 1.176 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1997 Charles D. Cranor and Washington University. | 4 | * Copyright (c) 1997 Charles D. Cranor and Washington University. | |
5 | * Copyright (c) 1991, 1993 The Regents of the University of California. | 5 | * Copyright (c) 1991, 1993 The Regents of the University of California. | |
6 | * Copyright (c) 1988 University of Utah. | 6 | * Copyright (c) 1988 University of Utah. | |
7 | * | 7 | * | |
8 | * All rights reserved. | 8 | * All rights reserved. | |
9 | * | 9 | * | |
10 | * This code is derived from software contributed to Berkeley by | 10 | * This code is derived from software contributed to Berkeley by | |
11 | * the Systems Programming Group of the University of Utah Computer | 11 | * the Systems Programming Group of the University of Utah Computer | |
12 | * Science Department. | 12 | * Science Department. | |
13 | * | 13 | * | |
14 | * Redistribution and use in source and binary forms, with or without | 14 | * Redistribution and use in source and binary forms, with or without | |
@@ -36,31 +36,32 @@ | @@ -36,31 +36,32 @@ | |||
36 | * SUCH DAMAGE. | 36 | * SUCH DAMAGE. | |
37 | * | 37 | * | |
38 | * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ | 38 | * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ | |
39 | * @(#)vm_mmap.c 8.5 (Berkeley) 5/19/94 | 39 | * @(#)vm_mmap.c 8.5 (Berkeley) 5/19/94 | |
40 | * from: Id: uvm_mmap.c,v 1.1.2.14 1998/01/05 21:04:26 chuck Exp | 40 | * from: Id: uvm_mmap.c,v 1.1.2.14 1998/01/05 21:04:26 chuck Exp | |
41 | */ | 41 | */ | |
42 | 42 | |||
43 | /* | 43 | /* | |
44 | * uvm_mmap.c: system call interface into VM system, plus kernel vm_mmap | 44 | * uvm_mmap.c: system call interface into VM system, plus kernel vm_mmap | |
45 | * function. | 45 | * function. | |
46 | */ | 46 | */ | |
47 | 47 | |||
48 | #include <sys/cdefs.h> | 48 | #include <sys/cdefs.h> | |
49 | __KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.175 2020/02/23 15:46:43 ad Exp $"); | 49 | __KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.176 2021/07/21 06:35:45 skrll Exp $"); | |
50 | 50 | |||
51 | #include "opt_compat_netbsd.h" | 51 | #include "opt_compat_netbsd.h" | |
52 | #include "opt_pax.h" | 52 | #include "opt_pax.h" | |
53 | 53 | |||
54 | #include <sys/param.h> | |||
54 | #include <sys/types.h> | 55 | #include <sys/types.h> | |
55 | #include <sys/file.h> | 56 | #include <sys/file.h> | |
56 | #include <sys/filedesc.h> | 57 | #include <sys/filedesc.h> | |
57 | #include <sys/resourcevar.h> | 58 | #include <sys/resourcevar.h> | |
58 | #include <sys/mman.h> | 59 | #include <sys/mman.h> | |
59 | #include <sys/pax.h> | 60 | #include <sys/pax.h> | |
60 | 61 | |||
61 | #include <sys/syscallargs.h> | 62 | #include <sys/syscallargs.h> | |
62 | 63 | |||
63 | #include <uvm/uvm.h> | 64 | #include <uvm/uvm.h> | |
64 | #include <uvm/uvm_device.h> | 65 | #include <uvm/uvm_device.h> | |
65 | 66 | |||
66 | static int uvm_mmap(struct vm_map *, vaddr_t *, vsize_t, vm_prot_t, vm_prot_t, | 67 | static int uvm_mmap(struct vm_map *, vaddr_t *, vsize_t, vm_prot_t, vm_prot_t, |
--- src/sys/uvm/pmap/pmap_pvt.c 2020/03/16 20:07:44 1.10
+++ src/sys/uvm/pmap/pmap_pvt.c 2021/07/21 06:35:45 1.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: pmap_pvt.c,v 1.10 2020/03/16 20:07:44 ad Exp $ */ | 1 | /* $NetBSD: pmap_pvt.c,v 1.11 2021/07/21 06:35:45 skrll Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2014, 2020 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2014, 2020 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Taylor R. Campbell. | 8 | * by Taylor R. Campbell. | |
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. | |
@@ -20,28 +20,29 @@ | @@ -20,28 +20,29 @@ | |||
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
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 | #include <sys/cdefs.h> | 32 | #include <sys/cdefs.h> | |
33 | __RCSID("$NetBSD: pmap_pvt.c,v 1.10 2020/03/16 20:07:44 ad Exp $"); | 33 | __RCSID("$NetBSD: pmap_pvt.c,v 1.11 2021/07/21 06:35:45 skrll Exp $"); | |
34 | 34 | |||
35 | #include <sys/param.h> | |||
35 | #include <sys/atomic.h> | 36 | #include <sys/atomic.h> | |
36 | #include <sys/kmem.h> | 37 | #include <sys/kmem.h> | |
37 | #include <sys/pserialize.h> | 38 | #include <sys/pserialize.h> | |
38 | 39 | |||
39 | #include <uvm/uvm.h> | 40 | #include <uvm/uvm.h> | |
40 | #include <uvm/pmap/pmap_pvt.h> | 41 | #include <uvm/pmap/pmap_pvt.h> | |
41 | 42 | |||
42 | /* | 43 | /* | |
43 | * unmanaged pv-tracked ranges | 44 | * unmanaged pv-tracked ranges | |
44 | * | 45 | * | |
45 | * This is a linear list for now because the only user are the DRM | 46 | * This is a linear list for now because the only user are the DRM | |
46 | * graphics drivers, with a single tracked range per device, for the | 47 | * graphics drivers, with a single tracked range per device, for the | |
47 | * graphics aperture, so there are expected to be few of them. | 48 | * graphics aperture, so there are expected to be few of them. |