diff -r 9dc17725f795 -r 1d371a84a085 src/cpu/o3/lsq_unit_impl.hh
--- a/src/cpu/o3/lsq_unit_impl.hh	Wed Feb 23 15:10:50 2011 -0600
+++ b/src/cpu/o3/lsq_unit_impl.hh	Fri Feb 25 22:57:40 2011 -0600
@@ -1103,7 +1103,9 @@
                 dynamic_cast<LSQSenderState *>(retryPkt->senderState);
 
             // Don't finish the store unless this is the last packet.
-            if (!TheISA::HasUnalignedMemAcc || !state->pktToSend) {
+            if (!TheISA::HasUnalignedMemAcc || !state->pktToSend ||
+                    state->pendingPacket == retryPkt) {
+                state->pktToSend = false;
                 storePostSend(retryPkt);
             }
             retryPkt = NULL;