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

1 files changed, 2 insertions, 3 deletions

diff --git a/sys/xen/gnttab.h b/sys/xen/gnttab.h
index d1abe14c9fb7..bcefbbc131bf 100644
--- a/sys/xen/gnttab.h
+++ b/sys/xen/gnttab.h
@@ -36,10 +36,9 @@
 
 #ifndef __ASM_GNTTAB_H__
 
-#include <machine/xen/hypervisor.h>
+#include <xen/hypervisor.h>
 #include <xen/interface/grant_table.h>
 #include <machine/xen/xen-os.h>
-#include <machine/xen/hypervisor.h>
 #include <machine/xen/features.h>
 
 struct gnttab_free_callback {
@@ -52,7 +51,7 @@ struct gnttab_free_callback {
 int gnttab_init(void);
 
 int gnttab_grant_foreign_access(domid_t domid, unsigned long frame,
-				int flags);
+    int flags, grant_ref_t *result);
 
 /*
  * End access through the given grant reference, iff the grant entry is no