aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/asm-x86/p2m.h
diff options
context:
space:
mode:
authorTim Deegan <Tim.Deegan@citrix.com>2011-06-02 13:16:52 +0100
committerTim Deegan <Tim.Deegan@citrix.com>2011-06-02 13:16:52 +0100
commiteca988de7381e5efe58792dc166611e4523d33b3 (patch)
tree7cbe42ffc5c067e6bdd193356bb80e81132e13b2 /xen/include/asm-x86/p2m.h
parent5bf494a7bf3674f32ebaab1b70b76e5f174812a3 (diff)
downloadxen-eca988de7381e5efe58792dc166611e4523d33b3.tar.gz
xen-eca988de7381e5efe58792dc166611e4523d33b3.tar.bz2
xen-eca988de7381e5efe58792dc166611e4523d33b3.zip
x86/mm: merge the shadow, hap and log-dirty locks into a single paging lock.
This will allow us to simplify the locking around calls between hap/shadow and log-dirty code. Many log-dirty paths already need the shadow or HAP lock so it shouldn't increase contention that much. Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
Diffstat (limited to 'xen/include/asm-x86/p2m.h')
-rw-r--r--xen/include/asm-x86/p2m.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index 1f92b0c20b..0b4fa905d7 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -337,8 +337,8 @@ static inline mfn_t gfn_to_mfn_type(struct domain *d,
/* Syntactic sugar: most callers will use one of these.
* N.B. gfn_to_mfn_query() is the _only_ one guaranteed not to take the
- * p2m lock; none of the others can be called with the p2m, hap or
- * shadow lock held. */
+ * p2m lock; none of the others can be called with the p2m or paging
+ * lock held. */
#define gfn_to_mfn(d, g, t) gfn_to_mfn_type((d), (g), (t), p2m_alloc)
#define gfn_to_mfn_query(d, g, t) gfn_to_mfn_type((d), (g), (t), p2m_query)
#define gfn_to_mfn_guest(d, g, t) gfn_to_mfn_type((d), (g), (t), p2m_guest)