[Xen-changelog] [xen stable-4.6] x86/p2m: fix mismatched unlock

[patchbot@xxxxxxx]

commit 70d63e48077f8fee8eda6d8d95eeda52a34d9077
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Sep 14 13:43:31 2015 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Sep 14 13:43:31 2015 +0200

    x86/p2m: fix mismatched unlock
    
    Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is
    only a cosmetic issue right now.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: George Dunlap <george.dunlap@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    master commit: 1f180822ad3fe83fe293393ec175f14ded98f082
    master date: 2015-09-14 13:39:19 +0200
---
 xen/arch/x86/mm/p2m.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index b2726bd..6b4a35b 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -912,7 +912,7 @@ static int set_typed_p2m_entry(struct domain *d, unsigned 
long gfn, mfn_t mfn,
     omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL);
     if ( p2m_is_grant(ot) || p2m_is_foreign(ot) )
     {
-        p2m_unlock(p2m);
+        gfn_unlock(p2m, gfn, 0);
         domain_crash(d);
         return -ENOENT;
     }
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog