From 6094f4313211dd8c6ee9458b4aeeac943d2e5aed Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 17 Aug 2012 16:43:28 -0400 Subject: [PATCH] --- yaml --- r: 322287 b: refs/heads/master c: c96aae1f7f393387d160211f60398d58463a7e65 h: refs/heads/master i: 322285: 7ec8cae2565341dad46b849eb2837064e6b6c37f 322283: c0a9893964f238294ccdb2fb3e3e42c373513303 322279: 6bf4bc64938d152d35728ef368c6d905c8c18949 322271: 41b73a17b33970f9f36033d88c8c1cf4773e9536 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/setup.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8067be994d96..e5a5bf4aceb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 250a41e0ecc433cdd553a364d0fc74c766425209 +refs/heads/master: c96aae1f7f393387d160211f60398d58463a7e65 diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c index ead85576d54a..d11ca11d14fc 100644 --- a/trunk/arch/x86/xen/setup.c +++ b/trunk/arch/x86/xen/setup.c @@ -78,9 +78,16 @@ static void __init xen_add_extra_mem(u64 start, u64 size) memblock_reserve(start, size); xen_max_p2m_pfn = PFN_DOWN(start + size); + for (pfn = PFN_DOWN(start); pfn < xen_max_p2m_pfn; pfn++) { + unsigned long mfn = pfn_to_mfn(pfn); + + if (WARN(mfn == pfn, "Trying to over-write 1-1 mapping (pfn: %lx)\n", pfn)) + continue; + WARN(mfn != INVALID_P2M_ENTRY, "Trying to remove %lx which has %lx mfn!\n", + pfn, mfn); - for (pfn = PFN_DOWN(start); pfn <= xen_max_p2m_pfn; pfn++) __set_phys_to_machine(pfn, INVALID_P2M_ENTRY); + } } static unsigned long __init xen_do_chunk(unsigned long start,