diff -r 89017e3d44ea -r 32ea2cb28dea src/arch/x86/regs/msr.hh
--- a/src/arch/x86/regs/msr.hh	Tue Sep 10 15:21:09 2013 +0200
+++ b/src/arch/x86/regs/msr.hh	Tue Sep 10 15:21:14 2013 +0200
@@ -32,11 +32,16 @@
 #define __ARCH_X86_REG_MSR_HH__
 
 #include "arch/x86/regs/misc.hh"
+#include "base/hashmap.hh"
 #include "base/types.hh"
 
 namespace X86ISA
 {
 
+typedef m5::hash_map<Addr, MiscRegIndex> MsrMap;
+
+extern MsrMap msrMap;
+
 bool msrAddrToIndex(MiscRegIndex &regNum, Addr addr);
 
 } // namespace X86ISA
diff -r 89017e3d44ea -r 32ea2cb28dea src/arch/x86/regs/msr.cc
--- a/src/arch/x86/regs/msr.cc	Tue Sep 10 15:21:09 2013 +0200
+++ b/src/arch/x86/regs/msr.cc	Tue Sep 10 15:21:14 2013 +0200
@@ -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,7 +143,7 @@
 
 static const unsigned msrMapSize = sizeof(msrMapData) / sizeof(msrMapData[0]);
 
-static MsrMap msrMap(msrMapData, msrMapData + msrMapSize);
+MsrMap msrMap(msrMapData, msrMapData + msrMapSize);
 
 bool
 msrAddrToIndex(MiscRegIndex &regNum, Addr addr)