diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 15:26:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 15:26:54 -0500 |
commit | 224394ad75711042c6d362c9dbc9874b476edbc0 (patch) | |
tree | 69cff48bc367ca2f035685d16441b1fa51a53aee /include/xen | |
parent | ae664dba2724e59ddd66291b895f7370e28b9a7a (diff) | |
parent | 9d328a948f38ec240fc6d05db2c146e23ccd9b8b (diff) |
Merge tag 'stable/for-linus-3.8-rc0-bugfix-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen bugfixes from Konrad Rzeszutek Wilk:
"Two fixes. One of them is caused by the recent change introduced by
the 'x86-bsp-hotplug-for-linus' tip tree that inhibited bootup (old
function does not do what it used to do). The other one is just a
vanilla bug.
- Fix to bootup regression introduced by 'x86-bsp-hotplug-for-linus'
tip branch.
- Fix to vcpu hotplug code."
* tag 'stable/for-linus-3.8-rc0-bugfix-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/vcpu: Fix vcpu restore path.
xen: Add EVTCHNOP_reset in Xen interface header files.
xen/smp: Use smp_store_boot_cpu_info() to store cpu info for BSP during boot time.
Diffstat (limited to 'include/xen')
-rw-r--r-- | include/xen/interface/event_channel.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/xen/interface/event_channel.h b/include/xen/interface/event_channel.h index 2090881c3650..f4942921e202 100644 --- a/include/xen/interface/event_channel.h +++ b/include/xen/interface/event_channel.h | |||
@@ -177,6 +177,19 @@ struct evtchn_unmask { | |||
177 | evtchn_port_t port; | 177 | evtchn_port_t port; |
178 | }; | 178 | }; |
179 | 179 | ||
180 | /* | ||
181 | * EVTCHNOP_reset: Close all event channels associated with specified domain. | ||
182 | * NOTES: | ||
183 | * 1. <dom> may be specified as DOMID_SELF. | ||
184 | * 2. Only a sufficiently-privileged domain may specify other than DOMID_SELF. | ||
185 | */ | ||
186 | #define EVTCHNOP_reset 10 | ||
187 | struct evtchn_reset { | ||
188 | /* IN parameters. */ | ||
189 | domid_t dom; | ||
190 | }; | ||
191 | typedef struct evtchn_reset evtchn_reset_t; | ||
192 | |||
180 | struct evtchn_op { | 193 | struct evtchn_op { |
181 | uint32_t cmd; /* EVTCHNOP_* */ | 194 | uint32_t cmd; /* EVTCHNOP_* */ |
182 | union { | 195 | union { |