Merge zizzer:/bk/newmem

into zower.eecs.umich.edu:/eecshome/m5/newmem src/cpu/o3/commit_impl.hh: Hand Merge --HG-- extra : convert_revision : 6984db90d5b5ec71c31f1c345f5a77eed540059e
2006-12-06 06:05:28 -05:00
parent be29adf51c 54a946604b
commit 2dcf00bc8b
140 changed files with 11983 additions and 37639 deletions
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -733,7 +733,6 @@ DefaultCommit<Impl>::commit()

            if (!squash_bdelay_slot)
                bdelay_done_seq_num++;
-
 #endif

            if (fromIEW->includeSquashInst[tid] == true) {