diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-07-19 04:00:35 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-07-19 04:00:35 +0000 |
| commit | 11a19ed09ab9da8aa52c25f266ae7f5d57ecfef3 (patch) | |
| tree | 4ff952f9efc86c9d34f0906c70a90072f7c82fc6 /sys/amd64/include | |
| parent | 74e82794985a5fd827fa091239a2d850f73ce3c2 (diff) | |
| download | FreeBSD-src-11a19ed09ab9da8aa52c25f266ae7f5d57ecfef3.zip FreeBSD-src-11a19ed09ab9da8aa52c25f266ae7f5d57ecfef3.tar.gz | |
Added code to support #define APIC_PIN0_TIMER.
This code ALWAYS runs the 8254 timer thru the 8259 ICU.
It depricates the usage of "options SMP_TIMER_NC" in the config file.
Diffstat (limited to 'sys/amd64/include')
| -rw-r--r-- | sys/amd64/include/mptable.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index de10f8c..3805c2a 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.16 1997/07/18 19:45:41 smp Exp smp $ + * $Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $ */ #include "opt_smp.h" @@ -45,7 +45,7 @@ #include <machine/mpapic.h> #include <machine/cpufunc.h> #include <machine/segments.h> -#include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ +#include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> @@ -1070,8 +1070,12 @@ isa_apic_pin(int isa_irq) int intr; #if defined(SMP_TIMER_NC) +#if defined(APIC_PIN0_TIMER) +#error 'options SMP_TIMER_NC' no longer used, remove & reconfig. +#else if (isa_irq == 0) return -1; +#endif /* APIC_PIN0_TIMER */ #endif /* SMP_TIMER_NC */ for (intr = 0; intr < nintrs; ++intr) { /* check each record */ |
