commit 82c92ed1357bca22a5d637fbb93dab3eb18a8e8c
author Juergen Gross <jgross@suse.com> Mon Jan 12 06:05:07 2015 +0100
committer David Vrabel <david.vrabel@citrix.com> Mon Jan 12 10:09:34 2015 +0000
tree db491472b60cfc8a255c0f3c7973fae70995351f
parent 7be0772d19103b3eac3c2e9ac325df2563273fdc

xen: correct error for building p2m list on 32 bits

In xen_rebuild_p2m_list() for large areas of invalid or identity
mapped memory the pmd entries on 32 bit systems are initialized
wrong. Correct this error.

Suggested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

arch/x86/xen/p2m.c

diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index cab221d..ff4ebd8 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -378,7 +378,7 @@
 			p2m_missing_pte : p2m_identity_pte;
 		for (i = 0; i < PMDS_PER_MID_PAGE; i++) {
 			pmdp = populate_extra_pmd(
-				(unsigned long)(p2m + pfn + i * PTRS_PER_PTE));
+				(unsigned long)(p2m + pfn) + i * PMD_SIZE);
 			set_pmd(pmdp, __pmd(__pa(ptep) | _KERNPG_TABLE));
 		}
 	}