diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 21:53:27 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 21:53:27 +0400 |
| commit | 3d09c623947a855ab9a21267c31f926cafa2c5bb (patch) | |
| tree | 718b7bfe9fbfb4843e473310c38d901a152e74a3 /drivers | |
| parent | 92b944170d67fec75ec20e1362fd8ecff078e7d1 (diff) | |
| parent | 13cd36a37a06ae0318d23b7e60adf0dac3547238 (diff) | |
| download | linux-3d09c623947a855ab9a21267c31f926cafa2c5bb.tar.xz | |
Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen fixes from David Vrabel:
"Xen regression and PVH fixes for 3.16-rc1
- fix dom0 PVH memory setup on latest unstable Xen releases
- fix 64-bit x86 PV guest boot failure on Xen 3.1 and earlier
- fix resume regression on non-PV (auto-translated physmap) guests"
* tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/grant-table: fix suspend for non-PV guests
x86/xen: no need to explicitly register an NMI callback
Revert "xen/pvh: Update E820 to work with PVH (v2)"
x86/xen: fix memory setup for PVH dom0
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/grant-table.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 6d325bda76da..5d4de88fe5b8 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1168,7 +1168,8 @@ int gnttab_resume(void) int gnttab_suspend(void) { - gnttab_interface->unmap_frames(); + if (!xen_feature(XENFEAT_auto_translated_physmap)) + gnttab_interface->unmap_frames(); return 0; } |