Drop unused opt_multiprocessor.h includes.diff -r1.23 -r1.24 src/sys/arch/powerpc/include/fpu.h
(rin)
--- src/sys/arch/powerpc/include/fpu.h 2020/07/06 09:34:17 1.23
+++ src/sys/arch/powerpc/include/fpu.h 2020/07/06 10:52:12 1.24
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: fpu.h,v 1.23 2020/07/06 09:34:17 rin Exp $ */ | 1 | /* $NetBSD: fpu.h,v 1.24 2020/07/06 10:52:12 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (C) 1996 Wolfgang Solfrank. | 4 | * Copyright (C) 1996 Wolfgang Solfrank. | |
5 | * Copyright (C) 1996 TooLs GmbH. | 5 | * Copyright (C) 1996 TooLs GmbH. | |
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 | |
@@ -60,27 +60,26 @@ | @@ -60,27 +60,26 @@ | |||
60 | #define FPSCR_VXSQRT 0x00000200 /* Invalid Sqrt Exception */ | 60 | #define FPSCR_VXSQRT 0x00000200 /* Invalid Sqrt Exception */ | |
61 | #define FPSCR_VXCVI 0x00000100 /* Invalid Op Integer Cvt Exception */ | 61 | #define FPSCR_VXCVI 0x00000100 /* Invalid Op Integer Cvt Exception */ | |
62 | #define FPSCR_VE 0x00000080 /* Invalid Op Exception Enable */ | 62 | #define FPSCR_VE 0x00000080 /* Invalid Op Exception Enable */ | |
63 | #define FPSCR_OE 0x00000040 /* Overflow Exception Enable */ | 63 | #define FPSCR_OE 0x00000040 /* Overflow Exception Enable */ | |
64 | #define FPSCR_UE 0x00000020 /* Underflow Exception Enable */ | 64 | #define FPSCR_UE 0x00000020 /* Underflow Exception Enable */ | |
65 | #define FPSCR_ZE 0x00000010 /* Zero Divide Exception Enable */ | 65 | #define FPSCR_ZE 0x00000010 /* Zero Divide Exception Enable */ | |
66 | #define FPSCR_XE 0x00000008 /* Inexact Exception Enable */ | 66 | #define FPSCR_XE 0x00000008 /* Inexact Exception Enable */ | |
67 | #define FPSCR_NI 0x00000004 /* Non-IEEE Mode Enable */ | 67 | #define FPSCR_NI 0x00000004 /* Non-IEEE Mode Enable */ | |
68 | #define FPSCR_RN 0x00000003 | 68 | #define FPSCR_RN 0x00000003 | |
69 | 69 | |||
70 | #ifdef _KERNEL | 70 | #ifdef _KERNEL | |
71 | 71 | |||
72 | #ifdef _KERNEL_OPT | 72 | #ifdef _KERNEL_OPT | |
73 | #include "opt_multiprocessor.h" | |||
74 | #include "opt_ppcarch.h" | 73 | #include "opt_ppcarch.h" | |
75 | #endif | 74 | #endif | |
76 | 75 | |||
77 | #include <sys/pcu.h> | 76 | #include <sys/pcu.h> | |
78 | #include <powerpc/mcontext.h> | 77 | #include <powerpc/mcontext.h> | |
79 | 78 | |||
80 | struct lwp; | 79 | struct lwp; | |
81 | bool fpu_used_p(struct lwp *); | 80 | bool fpu_used_p(struct lwp *); | |
82 | void fpu_mark_used(struct lwp *); | 81 | void fpu_mark_used(struct lwp *); | |
83 | 82 | |||
84 | void fpu_restore_from_mcontext(struct lwp *, const mcontext_t *); | 83 | void fpu_restore_from_mcontext(struct lwp *, const mcontext_t *); | |
85 | bool fpu_save_to_mcontext(struct lwp *, mcontext_t *, unsigned int *); | 84 | bool fpu_save_to_mcontext(struct lwp *, mcontext_t *, unsigned int *); | |
86 | 85 |
--- src/sys/arch/powerpc/oea/altivec.c 2020/07/06 09:34:17 1.32
+++ src/sys/arch/powerpc/oea/altivec.c 2020/07/06 10:52:12 1.33
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: altivec.c,v 1.32 2020/07/06 09:34:17 rin Exp $ */ | 1 | /* $NetBSD: altivec.c,v 1.33 2020/07/06 10:52:12 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (C) 1996 Wolfgang Solfrank. | 4 | * Copyright (C) 1996 Wolfgang Solfrank. | |
5 | * Copyright (C) 1996 TooLs GmbH. | 5 | * Copyright (C) 1996 TooLs GmbH. | |
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 | |
@@ -22,31 +22,27 @@ | @@ -22,31 +22,27 @@ | |||
22 | * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR | 22 | * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR | |
23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
24 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 24 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
25 | * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 25 | * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #include <sys/cdefs.h> | 34 | #include <sys/cdefs.h> | |
35 | __KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.32 2020/07/06 09:34:17 rin Exp $"); | 35 | __KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.33 2020/07/06 10:52:12 rin Exp $"); | |
36 | ||||
37 | #ifdef _KERNEL_OPT | |||
38 | #include "opt_multiprocessor.h" | |||
39 | #endif | |||
40 | 36 | |||
41 | #include <sys/param.h> | 37 | #include <sys/param.h> | |
42 | #include <sys/proc.h> | 38 | #include <sys/proc.h> | |
43 | #include <sys/systm.h> | 39 | #include <sys/systm.h> | |
44 | #include <sys/atomic.h> | 40 | #include <sys/atomic.h> | |
45 | 41 | |||
46 | #include <uvm/uvm_extern.h> /* for vcopypage/vzeropage */ | 42 | #include <uvm/uvm_extern.h> /* for vcopypage/vzeropage */ | |
47 | 43 | |||
48 | #include <powerpc/pcb.h> | 44 | #include <powerpc/pcb.h> | |
49 | #include <powerpc/altivec.h> | 45 | #include <powerpc/altivec.h> | |
50 | #include <powerpc/spr.h> | 46 | #include <powerpc/spr.h> | |
51 | #include <powerpc/oea/spr.h> | 47 | #include <powerpc/oea/spr.h> | |
52 | #include <powerpc/psl.h> | 48 | #include <powerpc/psl.h> |
--- src/sys/arch/powerpc/powerpc/fpu.c 2020/07/06 09:34:18 1.40
+++ src/sys/arch/powerpc/powerpc/fpu.c 2020/07/06 10:52:12 1.41
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: fpu.c,v 1.40 2020/07/06 09:34:18 rin Exp $ */ | 1 | /* $NetBSD: fpu.c,v 1.41 2020/07/06 10:52:12 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (C) 1996 Wolfgang Solfrank. | 4 | * Copyright (C) 1996 Wolfgang Solfrank. | |
5 | * Copyright (C) 1996 TooLs GmbH. | 5 | * Copyright (C) 1996 TooLs GmbH. | |
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 | |
@@ -22,31 +22,27 @@ | @@ -22,31 +22,27 @@ | |||
22 | * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR | 22 | * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR | |
23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
24 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 24 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
25 | * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 25 | * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #include <sys/cdefs.h> | 34 | #include <sys/cdefs.h> | |
35 | __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.40 2020/07/06 09:34:18 rin Exp $"); | 35 | __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.41 2020/07/06 10:52:12 rin Exp $"); | |
36 | ||||
37 | #ifdef _KERNEL_OPT | |||
38 | #include "opt_multiprocessor.h" | |||
39 | #endif | |||
40 | 36 | |||
41 | #include <sys/param.h> | 37 | #include <sys/param.h> | |
42 | #include <sys/proc.h> | 38 | #include <sys/proc.h> | |
43 | #include <sys/systm.h> | 39 | #include <sys/systm.h> | |
44 | #include <sys/atomic.h> | 40 | #include <sys/atomic.h> | |
45 | #include <sys/siginfo.h> | 41 | #include <sys/siginfo.h> | |
46 | #include <sys/pcu.h> | 42 | #include <sys/pcu.h> | |
47 | 43 | |||
48 | #include <machine/pcb.h> | 44 | #include <machine/pcb.h> | |
49 | #include <machine/fpu.h> | 45 | #include <machine/fpu.h> | |
50 | #include <machine/psl.h> | 46 | #include <machine/psl.h> | |
51 | 47 | |||
52 | static void fpu_state_load(lwp_t *, u_int); | 48 | static void fpu_state_load(lwp_t *, u_int); |
--- src/sys/arch/powerpc/powerpc/vm_machdep.c 2020/07/06 09:34:18 1.103
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c 2020/07/06 10:52:12 1.104
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: vm_machdep.c,v 1.103 2020/07/06 09:34:18 rin Exp $ */ | 1 | /* $NetBSD: vm_machdep.c,v 1.104 2020/07/06 10:52:12 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (C) 1995, 1996 Wolfgang Solfrank. | 4 | * Copyright (C) 1995, 1996 Wolfgang Solfrank. | |
5 | * Copyright (C) 1995, 1996 TooLs GmbH. | 5 | * Copyright (C) 1995, 1996 TooLs GmbH. | |
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 | |
@@ -22,31 +22,30 @@ | @@ -22,31 +22,30 @@ | |||
22 | * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR | 22 | * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR | |
23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
24 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 24 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
25 | * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 25 | * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #include <sys/cdefs.h> | 34 | #include <sys/cdefs.h> | |
35 | __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.103 2020/07/06 09:34:18 rin Exp $"); | 35 | __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.104 2020/07/06 10:52:12 rin Exp $"); | |
36 | 36 | |||
37 | #ifdef _KERNEL_OPT | 37 | #ifdef _KERNEL_OPT | |
38 | #include "opt_altivec.h" | 38 | #include "opt_altivec.h" | |
39 | #include "opt_multiprocessor.h" | |||
40 | #include "opt_ppcarch.h" | 39 | #include "opt_ppcarch.h" | |
41 | #include "opt_ppccache.h" | 40 | #include "opt_ppccache.h" | |
42 | #endif | 41 | #endif | |
43 | 42 | |||
44 | #include <sys/param.h> | 43 | #include <sys/param.h> | |
45 | #include <sys/core.h> | 44 | #include <sys/core.h> | |
46 | #include <sys/exec.h> | 45 | #include <sys/exec.h> | |
47 | #include <sys/proc.h> | 46 | #include <sys/proc.h> | |
48 | #include <sys/systm.h> | 47 | #include <sys/systm.h> | |
49 | #include <sys/vnode.h> | 48 | #include <sys/vnode.h> | |
50 | #include <sys/buf.h> | 49 | #include <sys/buf.h> | |
51 | 50 | |||
52 | #include <uvm/uvm.h> | 51 | #include <uvm/uvm.h> |