diff options
| author | Linus Torvalds | 2015-03-13 21:34:38 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2015-03-13 21:34:38 +0100 |
| commit | f47e331042fd5c98f8b4aebc224e7a48fd73e8bd (patch) | |
| tree | 7404afd384dd5c609b6685f666f2b24aa1438a8c /arch/x86 | |
| parent | Merge tag 'sound-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | xen-pciback: limit guest control of command register (diff) | |
| download | kernel-qcow2-linux-f47e331042fd5c98f8b4aebc224e7a48fd73e8bd.tar.gz kernel-qcow2-linux-f47e331042fd5c98f8b4aebc224e7a48fd73e8bd.tar.xz kernel-qcow2-linux-f47e331042fd5c98f8b4aebc224e7a48fd73e8bd.zip | |
Merge tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel:
- fix a PV regression in 3.19.
- fix a dom0 crash on hosts with large numbers of PIRQs.
- prevent pcifront from disabling memory or I/O port access, which may
trigger host crashes.
* tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen-pciback: limit guest control of command register
xen/events: avoid NULL pointer dereference in dom0 on large machines
xen: Remove trailing semicolon from xenbus_register_frontend() definition
x86/xen: correct bug in p2m list initialization
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/p2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index 740ae3026a14..9f93af56a5fc 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -563,7 +563,7 @@ static bool alloc_p2m(unsigned long pfn) if (p2m_pfn == PFN_DOWN(__pa(p2m_missing))) p2m_init(p2m); else - p2m_init_identity(p2m, pfn); + p2m_init_identity(p2m, pfn & ~(P2M_PER_PAGE - 1)); spin_lock_irqsave(&p2m_update_lock, flags); |