summaryrefslogtreecommitdiffstats
path: root/sys/i386/conf/XEN
diff options
context:
space:
mode:
authorkmacy <kmacy@FreeBSD.org>2008-12-29 06:31:03 +0000
committerkmacy <kmacy@FreeBSD.org>2008-12-29 06:31:03 +0000
commit9198d09682e0ff9e4b99c1a500c60ec311f33516 (patch)
tree78f4ff4cfc0d598fd6e8ccc01fa628fc8ded089f /sys/i386/conf/XEN
parente46dfc4a1843e8da9da2fceed45ebc43d45d62b1 (diff)
downloadFreeBSD-src-9198d09682e0ff9e4b99c1a500c60ec311f33516.zip
FreeBSD-src-9198d09682e0ff9e4b99c1a500c60ec311f33516.tar.gz
merge 186535, 186537, and 186538 from releng_7_xen
Log: - merge in latest xenbus from dfr's xenhvm - fix race condition in xs_read_reply by converting tsleep to mtx_sleep Log: unmask evtchn in bind_{virq, ipi}_to_irq Log: - remove code for handling case of not being able to sleep - eliminate tsleep - make sleeps atomic
Diffstat (limited to 'sys/i386/conf/XEN')
-rw-r--r--sys/i386/conf/XEN6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN
index 9295844..7ddc776 100644
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@@ -9,9 +9,9 @@ ident XEN
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions MODULES_OVERRIDE=""
-#options SCHED_ULE # ULE scheduler
-#options PREEMPTION # Enable kernel thread preemption
-options SCHED_4BSD
+options SCHED_ULE # ULE scheduler
+options PREEMPTION # Enable kernel thread preemption
+#options SCHED_4BSD
options INET # InterNETworking
options INET6 # IPv6 communications protocols
OpenPOWER on IntegriCloud