From fc821abd4cc8c7de33da0bf4a15c6ca5b53f82eb Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 10 Oct 1997 09:44:12 +0000 Subject: Convert the VM86 option from a global option to an option only depended on by the files that use it. Changing the VM86 option now only causes a recompile of a dozen files or so rather than the entire kernel. --- sys/amd64/amd64/cpu_switch.S | 3 ++- sys/amd64/amd64/exception.S | 5 ++++- sys/amd64/amd64/exception.s | 5 ++++- sys/amd64/amd64/genassym.c | 4 +++- sys/amd64/amd64/locore.S | 3 ++- sys/amd64/amd64/locore.s | 3 ++- sys/amd64/amd64/machdep.c | 3 ++- sys/amd64/amd64/mp_machdep.c | 3 ++- sys/amd64/amd64/mpboot.S | 4 +++- sys/amd64/amd64/mptable.c | 3 ++- sys/amd64/amd64/swtch.s | 3 ++- sys/amd64/amd64/sys_machdep.c | 4 +++- sys/amd64/amd64/trap.c | 3 ++- sys/amd64/amd64/vm_machdep.c | 3 ++- sys/amd64/include/mptable.h | 3 ++- 15 files changed, 37 insertions(+), 15 deletions(-) (limited to 'sys/amd64') diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 7a71f7e..4d57b64 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -33,11 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.62 1997/09/07 22:04:09 fsmp Exp $ + * $Id: swtch.s,v 1.63 1997/09/21 15:03:58 peter Exp $ */ #include "npx.h" #include "opt_user_ldt.h" +#include "opt_vm86.h" #include diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 1ed0f90..c7ec341 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -30,10 +30,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.22 1997/09/07 19:26:26 smp Exp smp $ + * $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $ */ + #include "npx.h" /* NNPX */ +#include "opt_vm86.h" + #include "assym.s" /* system defines */ #include /* SWI_AST_MASK ... */ #include /* PSL_I */ diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s index 1ed0f90..c7ec341 100644 --- a/sys/amd64/amd64/exception.s +++ b/sys/amd64/amd64/exception.s @@ -30,10 +30,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.22 1997/09/07 19:26:26 smp Exp smp $ + * $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $ */ + #include "npx.h" /* NNPX */ +#include "opt_vm86.h" + #include "assym.s" /* system defines */ #include /* SWI_AST_MASK ... */ #include /* PSL_I */ diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 38bb5c0..21a3ab8 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.47 1997/06/07 04:36:09 bde Exp $ + * $Id: genassym.c,v 1.48 1997/08/09 00:02:32 dyson Exp $ */ +#include "opt_vm86.h" + #include #include #include diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 56b6ba8..1bdca39 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.98 1997/09/21 05:49:56 dyson Exp $ + * $Id: locore.s,v 1.99 1997/09/21 15:03:56 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -47,6 +47,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_userconfig.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index 56b6ba8..1bdca39 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.98 1997/09/21 05:49:56 dyson Exp $ + * $Id: locore.s,v 1.99 1997/09/21 15:03:56 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -47,6 +47,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_userconfig.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 602d75c..9a0d107 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.265 1997/09/21 21:38:04 gibbs Exp $ + * $Id: machdep.c,v 1.266 1997/09/25 15:49:37 davidg Exp $ */ #include "apm.h" @@ -47,6 +47,7 @@ #include "opt_perfmon.h" #include "opt_smp.h" #include "opt_userconfig.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 2927ace..868ffea 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -22,10 +22,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $ + * $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $ */ #include "opt_smp.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S index 1c66dae..e3661f2 100644 --- a/sys/amd64/amd64/mpboot.S +++ b/sys/amd64/amd64/mpboot.S @@ -31,9 +31,11 @@ * mpboot.s: FreeBSD machine support for the Intel MP Spec * multiprocessor systems. * - * $Id: mpboot.s,v 1.4 1997/08/26 18:10:32 peter Exp $ + * $Id: mpboot.s,v 1.5 1997/09/22 05:03:03 peter Exp $ */ +#include "opt_vm86.h" + #include /* miscellaneous asm macros */ #include #include diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 2927ace..868ffea 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -22,10 +22,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $ + * $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $ */ #include "opt_smp.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s index 7a71f7e..4d57b64 100644 --- a/sys/amd64/amd64/swtch.s +++ b/sys/amd64/amd64/swtch.s @@ -33,11 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.62 1997/09/07 22:04:09 fsmp Exp $ + * $Id: swtch.s,v 1.63 1997/09/21 15:03:58 peter Exp $ */ #include "npx.h" #include "opt_user_ldt.h" +#include "opt_vm86.h" #include diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 30665c5..006f74c 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -31,11 +31,13 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $Id: sys_machdep.c,v 1.24 1997/08/28 14:36:54 jlemon Exp $ + * $Id: sys_machdep.c,v 1.25 1997/09/01 01:12:51 bde Exp $ * */ #include "opt_user_ldt.h" +#include "opt_vm86.h" + #include #include #include diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index b1e8c26..8260c8a 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.110 1997/09/05 08:54:54 peter Exp $ + * $Id: trap.c,v 1.111 1997/09/21 21:38:05 gibbs Exp $ */ /* @@ -44,6 +44,7 @@ #include "opt_ktrace.h" #include "opt_ddb.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 01ad04a..ae8fae7 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -38,11 +38,12 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.88 1997/09/10 12:31:28 joerg Exp $ + * $Id: vm_machdep.c,v 1.89 1997/09/13 16:12:04 joerg Exp $ */ #include "npx.h" #include "opt_bounce.h" +#include "opt_vm86.h" #include #include diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 2927ace..868ffea 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -22,10 +22,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.54 1997/09/21 15:03:57 peter Exp $ + * $Id: mp_machdep.c,v 1.56 1997/10/06 02:11:32 dyson Exp $ */ #include "opt_smp.h" +#include "opt_vm86.h" #include #include -- cgit v1.1