From: Julien Grall <julien.grall@citrix.com>
Date: Mon, 27 Apr 2015 14:58:33 +0000 (+0100)
Subject: xen/arm: p2m: Add an ASSERT to check that p2m lock is taken in __p2m_lookup
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3348
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60edd71276caee77b1d6046df53854d24e01f43b;p=xen.git

xen/arm: p2m: Add an ASSERT to check that p2m lock is taken in __p2m_lookup

__p2m_lookup should be called with the p2m lock taken. Add an ASSERT in
order to catch wrong caller in debug build.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 8dfee246b8..65efa949e5 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -160,6 +160,7 @@ static paddr_t __p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t)
     p2m_type_t _t;
     unsigned int level, root_table;
 
+    ASSERT(spin_is_locked(&p2m->lock));
     BUILD_BUG_ON(THIRD_MASK != PAGE_MASK);
 
     /* Allow t to be NULL */