From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 4 May 2016 07:43:37 +0000 (+0200)
Subject: x86/p2m: also tear down altp2m
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1171
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f85ea36ed1bc9d9d6d47801d0d323e00945b0aca;p=xen.git

x86/p2m: also tear down altp2m

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 6eef2f3ef5..94eabf673b 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -618,9 +618,11 @@ void p2m_teardown(struct p2m_domain *p2m)
 
 void p2m_final_teardown(struct domain *d)
 {
-    /* We must teardown unconditionally because
+    /*
+     * We must teardown both of them unconditionally because
      * we initialise them unconditionally.
      */
+    p2m_teardown_altp2m(d);
     p2m_teardown_nestedp2m(d);
 
     /* Iterate over all p2m tables per domain */