diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-12-29 06:31:03 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-12-29 06:31:03 +0000 |
| commit | 9198d09682e0ff9e4b99c1a500c60ec311f33516 (patch) | |
| tree | 78f4ff4cfc0d598fd6e8ccc01fa628fc8ded089f /sys/i386/xen/mptable.c | |
| parent | e46dfc4a1843e8da9da2fceed45ebc43d45d62b1 (diff) | |
| download | FreeBSD-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/xen/mptable.c')
| -rw-r--r-- | sys/i386/xen/mptable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/i386/xen/mptable.c b/sys/i386/xen/mptable.c index 99edc50..c6c7d53 100644 --- a/sys/i386/xen/mptable.c +++ b/sys/i386/xen/mptable.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/mptable.h> #include <machine/specialreg.h> -#include <machine/xen/hypervisor.h> +#include <xen/hypervisor.h> #include <machine/xen/xen-os.h> #include <machine/smp.h> #include <xen/interface/vcpu.h> |
