diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-23 11:13:15 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-23 11:13:15 +0100 |
commit | e4518ab90f63cd5bea3ddc15341162debc34442b (patch) | |
tree | fcefaeced9562de840bbf11ec2ffc95e1d9a571f /arch/x86/xen | |
parent | c56716af8d27ca8dd6e45445ae1c0a05fd9753a6 (diff) | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
download | op-kernel-dev-e4518ab90f63cd5bea3ddc15341162debc34442b.zip op-kernel-dev-e4518ab90f63cd5bea3ddc15341162debc34442b.tar.gz |
Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen')
-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 740ae30..9f93af5 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); |