diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-26 02:31:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-26 02:31:59 +0200 |
| commit | 267560874cb0189f28e7ae6dfbc8e98b8848be98 (patch) | |
| tree | 649702ebe9faf5679d6e81c08dc07c4fcb04a2dd /include | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M. (diff) | |
| download | linux-267560874cb0189f28e7ae6dfbc8e98b8848be98.tar.xz linux-267560874cb0189f28e7ae6dfbc8e98b8848be98.zip | |
Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull three xen bug-fixes from Konrad Rzeszutek Wilk:
- Revert the kexec fix which caused on non-kexec shutdowns a race.
- Reuse existing P2M leafs - instead of requiring to allocate a large
area of bootup virtual address estate.
- Fix a one-off error when adding PFNs for balloon pages.
* tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.
xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID.
Revert "xen PVonHVM: move shared_info to MMIO before kexec"
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/events.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/xen/events.h b/include/xen/events.h index 9c641deb65d2..04399b28e821 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -58,8 +58,6 @@ void notify_remote_via_irq(int irq); void xen_irq_resume(void); -void xen_hvm_prepare_kexec(struct shared_info *sip, unsigned long pfn); - /* Clear an irq's pending state, in preparation for polling on it */ void xen_clear_irq_pending(int irq); void xen_set_irq_pending(int irq); |