From 9198d09682e0ff9e4b99c1a500c60ec311f33516 Mon Sep 17 00:00:00 2001
From: kmacy <kmacy@FreeBSD.org>
Date: Mon, 29 Dec 2008 06:31:03 +0000
Subject: 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
---
 sys/i386/xen/mptable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/i386/xen/mptable.c')

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>
-- 
cgit v1.1