Merge with head.

--HG--
extra : convert_revision : 9ef81afcfabd86c9c069204998c987344f03f33e

src/cpu/o3/lsq_impl.hh

@@ -101,10 +101,11 @@ LSQ<Impl>::DcachePort::recvRetry()
         //Squashed, so drop it
         return;
     }
-    lsq->thread[lsq->retryTid].recvRetry();
+    int curr_retry_tid = lsq->retryTid;
     // Speculatively clear the retry Tid.  This will get set again if
     // the LSQUnit was unable to complete its access.
     lsq->retryTid = -1;
+    lsq->thread[curr_retry_tid].recvRetry();
 }
 
 template <class Impl>

src/cpu/o3/lsq_unit_impl.hh

@@ -928,6 +928,7 @@ void
 LSQUnit<Impl>::recvRetry()
 {
     if (isStoreBlocked) {
+        DPRINTF(LSQUnit, "Receiving retry: store blocked\n");
         assert(retryPkt != NULL);
 
         if (dcachePort->sendTiming(retryPkt)) {

util/style.py

@@ -286,7 +286,7 @@ def check_whitespace(ui, repo, hooktype, node, parent1, parent2):
 
     for fname in added:
         ok = True
-        for line,num in checkwhite(fname):
+        for line,num in checkwhite(repo.wjoin(fname)):
             ui.write("invalid whitespace in %s:%d\n" % (fname, num))
             if verbose:
                 ui.write(">>%s<<\n" % line[-1])