From 559e5f88909d0d69013a3dba7a11cc47474fbdbc Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 1 May 2001 00:19:24 +0000 Subject: Turn on preemption by default on the alpha arch. This also removes the PREEMPTION kernel option. Not objected to by: -alpha --- sys/alpha/alpha/interrupt.c | 5 ----- sys/conf/options.alpha | 1 - 2 files changed, 6 deletions(-) diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c index b28b53d..ead015b 100644 --- a/sys/alpha/alpha/interrupt.c +++ b/sys/alpha/alpha/interrupt.c @@ -34,7 +34,6 @@ */ #include "opt_ddb.h" -#include "opt_preemption.h" #include /* RCS ID & Copyright macro defns */ @@ -445,11 +444,7 @@ alpha_dispatch_intr(void *frame, unsigned long vector) "alpha_dispatch_intr: disabling vector 0x%x", i->vector); ithd->it_disable(ithd->it_vector); } -#ifdef PREEMPTION error = ithread_schedule(ithd, !cold); -#else - error = ithread_schedule(ithd, 0); -#endif KASSERT(error == 0, ("got an impossible stray interrupt")); } diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index 9456c7b..41d733c 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -20,7 +20,6 @@ API_UP1000 opt_cpu.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -PREEMPTION SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h -- cgit v1.1