From 2b450063344ae42492ff8be4666339fb610a43a1 Mon Sep 17 00:00:00 2001 From: Steve Passe Date: Mon, 28 Apr 1997 00:24:28 +0000 Subject: [PATCH] remove the SMP_INVLTLB option, making the code default for APIC_IO. Reviewed by: informal discussion with Peter Wemm --- sys/conf/NOTES | 4 +--- sys/conf/options.i386 | 5 +---- sys/i386/conf/LINT | 4 +--- sys/i386/conf/NOTES | 4 +--- sys/i386/conf/options.i386 | 5 +---- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 016a0246ec9..026e9d5abba 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.327 1997/04/14 00:35:23 gibbs Exp $ +# $Id: LINT,v 1.328 1997/04/26 11:44:55 peter Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -66,7 +66,6 @@ config kernel root on wd0 dumps on wd0 # # SMP enables building of a Symmetric MultiProcessor Kernel. # APIC_IO enables the use of the IO APIC for Symmetric I/O. -# SMP_INVLTLB enables code to send inter-CPU TLB invalidation messages. # NCPU sets the number of CPUs, defaults to 2. # NBUS sets the number of busses, defaults to 4. # NAPIC sets the number of IO APICs on the motherboard, defaults to 1. @@ -93,7 +92,6 @@ options SMP # Symmetric MultiProcessor Kernel # Recommended: options APIC_IO # Symmetric (APIC) I/O -options SMP_INVLTLB # invalidate TLB IPIs # Optional, these are the defaults: #options NCPU=2 # number of CPUs diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 29d3f9e60be..161e73d9740 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.40 1997/04/26 11:44:59 peter Exp $ +# $Id: options.i386,v 1.41 1997/04/27 20:01:47 peter Exp $ XXXCreateMe opt_global.h BOUNCEPAGES opt_bounce.h @@ -38,9 +38,6 @@ NAPIC opt_smp.h NINTR opt_smp.h SMP_TIMER_NC opt_smp.h -# Should be working. When one cpu flushes it's TLB, it's propagated to all. -SMP_INVLTLB opt_smp_invltlb.h - # These three are known to be broken, don't enable them. SMP_PRIVPAGES opt_smp_privpages.h SMP_AUTOSTART opt_smp_autostart.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 016a0246ec9..026e9d5abba 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.327 1997/04/14 00:35:23 gibbs Exp $ +# $Id: LINT,v 1.328 1997/04/26 11:44:55 peter Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -66,7 +66,6 @@ config kernel root on wd0 dumps on wd0 # # SMP enables building of a Symmetric MultiProcessor Kernel. # APIC_IO enables the use of the IO APIC for Symmetric I/O. -# SMP_INVLTLB enables code to send inter-CPU TLB invalidation messages. # NCPU sets the number of CPUs, defaults to 2. # NBUS sets the number of busses, defaults to 4. # NAPIC sets the number of IO APICs on the motherboard, defaults to 1. @@ -93,7 +92,6 @@ options SMP # Symmetric MultiProcessor Kernel # Recommended: options APIC_IO # Symmetric (APIC) I/O -options SMP_INVLTLB # invalidate TLB IPIs # Optional, these are the defaults: #options NCPU=2 # number of CPUs diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 016a0246ec9..026e9d5abba 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.327 1997/04/14 00:35:23 gibbs Exp $ +# $Id: LINT,v 1.328 1997/04/26 11:44:55 peter Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -66,7 +66,6 @@ config kernel root on wd0 dumps on wd0 # # SMP enables building of a Symmetric MultiProcessor Kernel. # APIC_IO enables the use of the IO APIC for Symmetric I/O. -# SMP_INVLTLB enables code to send inter-CPU TLB invalidation messages. # NCPU sets the number of CPUs, defaults to 2. # NBUS sets the number of busses, defaults to 4. # NAPIC sets the number of IO APICs on the motherboard, defaults to 1. @@ -93,7 +92,6 @@ options SMP # Symmetric MultiProcessor Kernel # Recommended: options APIC_IO # Symmetric (APIC) I/O -options SMP_INVLTLB # invalidate TLB IPIs # Optional, these are the defaults: #options NCPU=2 # number of CPUs diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 29d3f9e60be..161e73d9740 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.40 1997/04/26 11:44:59 peter Exp $ +# $Id: options.i386,v 1.41 1997/04/27 20:01:47 peter Exp $ XXXCreateMe opt_global.h BOUNCEPAGES opt_bounce.h @@ -38,9 +38,6 @@ NAPIC opt_smp.h NINTR opt_smp.h SMP_TIMER_NC opt_smp.h -# Should be working. When one cpu flushes it's TLB, it's propagated to all. -SMP_INVLTLB opt_smp_invltlb.h - # These three are known to be broken, don't enable them. SMP_PRIVPAGES opt_smp_privpages.h SMP_AUTOSTART opt_smp_autostart.h