diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-30 17:01:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-30 17:01:18 -0400 |
| commit | 3655b22de04e3635fe3a2d7b9529cb12609a9bd0 (patch) | |
| tree | e9c55e77e44a6de74c62ee7d907a293d97033fd3 /include | |
| parent | 5489e948dc0f41a249c109d74612bf5aceab8f38 (diff) | |
| parent | 8d0b8801c9e4c2c6b20cdac74dbab16facce7653 (diff) | |
Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen fixes from Konrad Rzeszutek Wilk:
- Use proper error paths
- Clean up APIC IPI usage (incorrect arguments)
- Delay XenBus frontend resume is backend (xenstored) is not running
- Fix build error with various combinations of CONFIG_
* tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xenbus_client.c: correct exit path for xenbus_map_ring_valloc_hvm
xen-pciback: more uses of cached MSI-X capability offset
xen: Clean up apic ipi interface
xenbus: save xenstore local status for later use
xenbus: delay xenbus frontend resume if xenstored is not running
xmem/tmem: fix 'undefined variable' build error.
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/xenbus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 0a7515c1e3a4..569c07f2e344 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h | |||
| @@ -70,6 +70,7 @@ struct xenbus_device { | |||
| 70 | struct device dev; | 70 | struct device dev; |
| 71 | enum xenbus_state state; | 71 | enum xenbus_state state; |
| 72 | struct completion down; | 72 | struct completion down; |
| 73 | struct work_struct work; | ||
| 73 | }; | 74 | }; |
| 74 | 75 | ||
| 75 | static inline struct xenbus_device *to_xenbus_device(struct device *dev) | 76 | static inline struct xenbus_device *to_xenbus_device(struct device *dev) |