From: Julian Seward <jseward@acm.org>
Date: Sun, 23 Nov 2014 12:03:05 +0000 (+0000)
Subject: Merge, from trunk, r14549
X-Git-Tag: svn/VALGRIND_3_10_1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3353701375cb2dd7cbd006603770a40e201df62;p=thirdparty%2Fvalgrind.git

Merge, from trunk, r14549
14549  DRD: Handle Imbe_CancelReservation properly (clrex on ARM)



git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14746
---

diff --git a/drd/drd_load_store.c b/drd/drd_load_store.c
index 973bdda925..afb88e16fd 100644
--- a/drd/drd_load_store.c
+++ b/drd/drd_load_store.c
@@ -633,7 +633,9 @@ IRSB* DRD_(instrument)(VgCallbackClosure* const closure,
          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);
          }