diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-07-26 01:55:19 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-07-26 01:55:19 +0000 |
| commit | 8d2474227fe29ac2be4c351bb26c86bfffd652eb (patch) | |
| tree | 3cd521ab4b254a95b25f79083bfefbd049c08b44 /sys/kern/subr_smp.c | |
| parent | 78cff7365d666ea82c32d53ae429cb3f5b843259 (diff) | |
| download | FreeBSD-src-8d2474227fe29ac2be4c351bb26c86bfffd652eb.zip FreeBSD-src-8d2474227fe29ac2be4c351bb26c86bfffd652eb.tar.gz | |
mpapic.c & mp_machdep:
- removed TEST_ALTTIMER.
- removed APIC_PIN0_TIMER.
- removed TIMER_ALL.
mplock.s:
- minor update of try_mplock for new algorithm where a CPU uses try_mplock
instead of get_mplock in the ISRs.
Diffstat (limited to 'sys/kern/subr_smp.c')
| -rw-r--r-- | sys/kern/subr_smp.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 8a3f0c2..daf3033 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -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.20 1997/07/23 20:20:21 smp Exp smp $ + * $Id: mp_machdep.c,v 1.36 1997/07/23 20:47:19 fsmp Exp $ */ #include "opt_smp.h" @@ -40,7 +40,7 @@ #include <machine/apic.h> #include <machine/mpapic.h> #include <machine/segments.h> -#include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */ +#include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> @@ -1068,17 +1068,6 @@ isa_apic_pin(int isa_irq) { int intr; -#if defined(SMP_TIMER_NC) -#if defined(NEW_STRATEGY) || defined(APIC_PIN0_TIMER) -#error -#error 'options SMP_TIMER_NC' no longer used, remove & reconfig. -#error -#else - if (isa_irq == 0) - return -1; -#endif /* NEW_STRATEGY || APIC_PIN0_TIMER */ -#endif /* SMP_TIMER_NC */ - for (intr = 0; intr < nintrs; ++intr) { /* check each record */ if (INTTYPE(intr) == 0) { /* standard INT */ if (SRCBUSIRQ(intr) == isa_irq) { |
