aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Deegan <tim@xen.org>2012-01-12 16:39:05 +0000
committerTim Deegan <tim@xen.org>2012-01-12 16:39:05 +0000
commite4dbfcfe9d63087affb09c41dce0e069dc45d7bc (patch)
tree3f517b88a6fa0d6bc9781b34a827d970fe10f6e0
parentd80c4826059a6a59a1eaa268e6ce5125c90c77ea (diff)
downloadxen-e4dbfcfe9d63087affb09c41dce0e069dc45d7bc.tar.gz
xen-e4dbfcfe9d63087affb09c41dce0e069dc45d7bc.tar.bz2
xen-e4dbfcfe9d63087affb09c41dce0e069dc45d7bc.zip
x86/mm: Fix operator associativity bug in mm-locks.h
In an order-enforcing wrapper for an "external" recursive lock, we aim to increment/decrement a recurse count and only update the lock ordering on zero counts. Unfortunately we incrementing/decrementing the pointer to the recurse count, rather than the count itself. Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org> Acked-by: Tim Deegan <tim@xen.org> Committed-by: Tim Deegan <tim@xen.org>
-rw-r--r--xen/arch/x86/mm/mm-locks.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h
index 738b27c6c7..058de9a943 100644
--- a/xen/arch/x86/mm/mm-locks.h
+++ b/xen/arch/x86/mm/mm-locks.h
@@ -81,7 +81,7 @@ static inline void _mm_enforce_order_lock_post(int level, int *unlock_level,
{
if ( recurse_count )
{
- if ( *recurse_count++ == 0 )
+ if ( (*recurse_count)++ == 0 )
{
*unlock_level = __get_lock_level();
}
@@ -125,7 +125,7 @@ static inline void mm_enforce_order_unlock(int unlock_level,
if ( recurse_count )
{
BUG_ON(*recurse_count == 0);
- if ( *recurse_count-- == 1 )
+ if ( (*recurse_count)-- == 1 )
{
__set_lock_level(unlock_level);
}