diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:05:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:05:53 +1100 |
| commit | 95d7a121d9a09bbcaab277a30c6b9dcafaed49a0 (patch) | |
| tree | 1eb3b75d77943711d702c8fdf960b10910e2d13d /include | |
| parent | 49ff176411cf8bb78190160506d64b1432b93fdd (diff) | |
| parent | ab3c31a2504756d70041ca54021a7313c4871e69 (diff) | |
Merge remote branch 'swiotlb-xen/master'
Conflicts:
drivers/xen/Kconfig
drivers/xen/Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/events.h | 10 | ||||
| -rw-r--r-- | include/xen/xenbus.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/xen/events.h b/include/xen/events.h index 00f53ddcc062..cdd308e71b31 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -23,6 +23,12 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, unsigned long irqflags, const char *devname, void *dev_id); +int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain, + unsigned int remote_port, + irq_handler_t handler, + unsigned long irqflags, + const char *devname, + void *dev_id); /* * Common unbind function for all event sources. Takes IRQ to unbind from. @@ -91,7 +97,11 @@ int xen_vector_from_irq(unsigned pirq); /* Return gsi allocated to pirq */ int xen_gsi_from_irq(unsigned pirq); + /* Return irq from pirq */ int xen_irq_from_pirq(unsigned pirq); +/* Determine whether to ignore this IRQ if passed to a guest. */ +int xen_ignore_irq(int irq); + #endif /* _XEN_EVENTS_H */ diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 43e2d7d33976..7a1d15ff19b7 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -94,7 +94,7 @@ struct xenbus_driver { int (*remove)(struct xenbus_device *dev); int (*suspend)(struct xenbus_device *dev, pm_message_t state); int (*resume)(struct xenbus_device *dev); - int (*uevent)(struct xenbus_device *, char **, int, char *, int); + int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *); struct device_driver driver; int (*read_otherend_details)(struct xenbus_device *dev); int (*is_ready)(struct xenbus_device *dev); |