merge with m5 head

--HG--
extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311

1 files changed, 2 insertions, 2 deletions

diff --git a/base/trace.hh b/base/trace.hh
index 9e5952765..e49d7aa61 100644
--- a/base/trace.hh
+++ b/base/trace.hh
@@ -108,7 +108,7 @@ namespace Trace {
         int len;
 
       public:
-        RawDataRecord(Tick cycle, const uint8_t *_data, int _len);
+        RawDataRecord(Tick cycle, const void *_data, int _len);
         virtual ~RawDataRecord();
 
         virtual void dump(std::ostream &);
@@ -149,7 +149,7 @@ namespace Trace {
     }
 
     inline void
-    rawDump(const uint8_t *data, int len)
+    rawDump(const void *data, int len)
     {
         theLog.append(new Trace::RawDataRecord(curTick, data, len));
     }