aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Lagar-Cavilla <andres@lagarcavilla.org>2012-02-10 16:07:07 +0000
committerAndres Lagar-Cavilla <andres@lagarcavilla.org>2012-02-10 16:07:07 +0000
commit4fbe3f3e71ed8f619adfe66302d636923ff0cb04 (patch)
tree8e2d3612a64da58be0f47f0c6777780c5e0e3275
parent2981fb7d9dcbbe36228042fbf00618bb56ebafea (diff)
downloadxen-4fbe3f3e71ed8f619adfe66302d636923ff0cb04.tar.gz
xen-4fbe3f3e71ed8f619adfe66302d636923ff0cb04.tar.bz2
xen-4fbe3f3e71ed8f619adfe66302d636923ff0cb04.zip
x86/mm: Revert changeset 24582:f6c33cfe7333
With synchronized p2m lookups this is no longer needed, and we can lock the p2m up-front. Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org> Acked-by: Tim Deegan <tjd-xen@phlegethon.org> Committed-by: Tim Deegan <tim@xen.org>
-rw-r--r--xen/arch/x86/mm/p2m.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 8bbcce04e5..645c7f90f6 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -361,6 +361,8 @@ void p2m_teardown(struct p2m_domain *p2m)
if (p2m == NULL)
return;
+ p2m_lock(p2m);
+
#ifdef __x86_64__
for ( gfn=0; gfn < p2m->max_mapped_pfn; gfn++ )
{
@@ -374,8 +376,6 @@ void p2m_teardown(struct p2m_domain *p2m)
}
#endif
- p2m_lock(p2m);
-
p2m->phys_table = pagetable_null();
while ( (pg = page_list_remove_head(&p2m->pages)) )