|
From: <sv...@va...> - 2014-11-23 12:03:12
|
Author: sewardj
Date: Sun Nov 23 12:03:05 2014
New Revision: 14746
Log:
Merge, from trunk, r14549
14549 DRD: Handle Imbe_CancelReservation properly (clrex on ARM)
Modified:
branches/VALGRIND_3_10_BRANCH/ (props changed)
branches/VALGRIND_3_10_BRANCH/drd/drd_load_store.c
Modified: branches/VALGRIND_3_10_BRANCH/drd/drd_load_store.c
==============================================================================
--- branches/VALGRIND_3_10_BRANCH/drd/drd_load_store.c (original)
+++ branches/VALGRIND_3_10_BRANCH/drd/drd_load_store.c Sun Nov 23 12:03:05 2014
@@ -633,7 +633,9 @@
switch (st->Ist.MBE.event)
{
case Imbe_Fence:
- break; /* not interesting */
+ break; /* not interesting to DRD */
+ case Imbe_CancelReservation:
+ break; /* not interesting to DRD */
default:
tl_assert(0);
}
|