1 files changed, 2 insertions, 5 deletions
diff --git a/src/arch/x86/regs/msr.cc b/src/arch/x86/regs/msr.cc
index aeb283aff..462d87e8c 100644
--- a/src/arch/x86/regs/msr.cc
+++ b/src/arch/x86/regs/msr.cc
@@ -29,13 +29,10 @@
  */
 
 #include "arch/x86/regs/msr.hh"
-#include "base/hashmap.hh"
 
 namespace X86ISA
 {
 
-typedef m5::hash_map<Addr, MiscRegIndex> MsrMap;
-
 typedef MsrMap::value_type MsrVal;
 
 const MsrMap::value_type msrMapData[] = {
@@ -146,12 +143,12 @@ const MsrMap::value_type msrMapData[] = {
 
 static const unsigned msrMapSize = sizeof(msrMapData) / sizeof(msrMapData[0]);
 
-static MsrMap msrMap(msrMapData, msrMapData + msrMapSize);
+const MsrMap msrMap(msrMapData, msrMapData + msrMapSize);
 
 bool
 msrAddrToIndex(MiscRegIndex &regNum, Addr addr)
 {
-    MsrMap::iterator it = msrMap.find(addr);
+    MsrMap::const_iterator it(msrMap.find(addr));
     if (it == msrMap.end()) {
         return false;
     } else {