Merge with head.

[gem5.git] / src / cpu / profile.hh

diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index 7f96252417bac6a92d106a801096c8fd0a132d15..27bb4efec9c54faa1bf0963f1c39b2ca054800cf 100644 (file)
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -33,9 +33,9 @@
 
 #include <map>
 
+#include "arch/stacktrace.hh"
 #include "cpu/static_inst.hh"
 #include "sim/host.hh"
-#include "arch/stacktrace.hh"
 
 class ThreadContext;
 
@@ -66,7 +66,7 @@ class FunctionProfile
     const SymbolTable *symtab;
     ProfileNode top;
     std::map<Addr, Counter> pc_count;
-    StackTrace trace;
+    TheISA::StackTrace trace;
 
   public:
     FunctionProfile(const SymbolTable *symtab);