diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-12-06 06:05:28 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-12-06 06:05:28 -0500 |
| commit | 2dcf00bc8b6ca0bdfc8ab9a105f7a7780c763bb4 (patch) | |
| tree | c34b7e7417d0c95255def0cea2a48a72229da344 /src/cpu/o3/commit_impl.hh | |
| parent | be29adf51cb115e7e55321bd58b7f6593e6d0080 (diff) | |
| parent | 54a946604b2fa81c0d58fc41bfe1d82840f44793 (diff) | |
| download | gem5-2dcf00bc8b6ca0bdfc8ab9a105f7a7780c763bb4.tar.xz | |
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
Diffstat (limited to 'src/cpu/o3/commit_impl.hh')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index ba6a62b4d..1527efe1a 100644 --- 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) { |