summaryrefslogtreecommitdiff
path: root/sys/kern/subr_smp.c
diff options
context:
space:
mode:
authorSteve Passe <fsmp@FreeBSD.org>1997-07-20 19:41:38 +0000
committerSteve Passe <fsmp@FreeBSD.org>1997-07-20 19:41:38 +0000
commit35b3c4a0e5591671f86f5ce649aed698780cfb64 (patch)
tree262ed31e026855350caaf4c356075a74060251e9 /sys/kern/subr_smp.c
parentc69ef9495ba42fb521db829e834d4e30e28d35ae (diff)
Notes
Diffstat (limited to 'sys/kern/subr_smp.c')
-rw-r--r--sys/kern/subr_smp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 343ea7db2f7c..c9724a10b0d9 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.17 1997/07/20 17:43:20 smp Exp smp $
+ * $Id: mp_machdep.c,v 1.18 1997/07/20 18:13:01 smp Exp smp $
*/
#include "opt_smp.h"
@@ -1065,12 +1065,14 @@ isa_apic_pin(int isa_irq)
int intr;
#if defined(SMP_TIMER_NC)
-#if defined(APIC_PIN0_TIMER)
+#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 /* APIC_PIN0_TIMER */
+#endif /* NEW_STRATEGY || APIC_PIN0_TIMER */
#endif /* SMP_TIMER_NC */
for (intr = 0; intr < nintrs; ++intr) { /* check each record */