Merge with head, hopefully the last time for this batch.

2012-01-31 22:40:08 -08:00
parent e88165a431 7d4f187700
commit ea8b347dc5
132 changed files with 1719 additions and 909 deletions
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -51,10 +51,10 @@
 #include "cpu/inst_seq.hh"
 #include "cpu/timebuf.hh"

-class DerivO3CPUParams;
+struct DerivO3CPUParams;

 template <class>
-class O3ThreadState;
+struct O3ThreadState;

 /**
 * DefaultCommit handles single threaded and SMT commit. Its width is