summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2001-05-01 00:19:24 +0000
committerjhb <jhb@FreeBSD.org>2001-05-01 00:19:24 +0000
commit559e5f88909d0d69013a3dba7a11cc47474fbdbc (patch)
tree4997dccd78665ec8920c13e2bb11c113a21c8150
parent841942d18f17ab01424f0d6a5752bc5c05b8d8bd (diff)
downloadFreeBSD-src-559e5f88909d0d69013a3dba7a11cc47474fbdbc.zip
FreeBSD-src-559e5f88909d0d69013a3dba7a11cc47474fbdbc.tar.gz
Turn on preemption by default on the alpha arch. This also removes the
PREEMPTION kernel option. Not objected to by: -alpha
-rw-r--r--sys/alpha/alpha/interrupt.c5
-rw-r--r--sys/conf/options.alpha1
2 files changed, 0 insertions, 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 <sys/cdefs.h> /* 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
OpenPOWER on IntegriCloud