X86: Fix X86_FS compilation.

--HG--
extra : convert_revision : 5f014337e33a9e1ebe4df4063335315539fff69e

diff --git a/src/arch/x86/mmaped_ipr.hh b/src/arch/x86/mmaped_ipr.hh
index c7befa35b89e7e5643f3f33d95ca1a61423ae8d4..9184ec4dc9d94d78a954728eaab026bc65cd84cd 100644 (file)
--- a/src/arch/x86/mmaped_ipr.hh
+++ b/src/arch/x86/mmaped_ipr.hh
@@ -65,6 +65,7 @@
  */
 
 #include "config/full_system.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "mem/packet.hh"
 
@@ -78,6 +79,7 @@ namespace X86ISA
 #else
         pkt->set(xc->readMiscReg(pkt->getAddr() / sizeof(MiscReg)));
 #endif
+        return xc->getCpuPtr()->ticks(1);
     }
 
     inline Tick
@@ -89,6 +91,7 @@ namespace X86ISA
         xc->setMiscReg(pkt->getAddr() / sizeof(MiscReg),
                 gtoh(pkt->get<uint64_t>()));
 #endif
+        return xc->getCpuPtr()->ticks(1);
     }
 };
 

diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index 96228b6c49fc2ac798c8d50d3602e7ddc91310ad..0eee0c93e2251a2ca9b45544f688b44bc6a6404c 100644 (file)
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -170,7 +170,7 @@ void initCPU(ThreadContext *tc, int cpuId)
     tc->setMiscReg(MISCREG_MTRR_FIX_16K_80000, 0);
     tc->setMiscReg(MISCREG_MTRR_FIX_16K_A0000, 0);
     tc->setMiscReg(MISCREG_MTRR_FIX_4K_C0000, 0);
-    tc->setMiscReg(MISCREG_MTRR_FIX_4k_C8000, 0);
+    tc->setMiscReg(MISCREG_MTRR_FIX_4K_C8000, 0);
     tc->setMiscReg(MISCREG_MTRR_FIX_4K_D0000, 0);
     tc->setMiscReg(MISCREG_MTRR_FIX_4K_D8000, 0);
     tc->setMiscReg(MISCREG_MTRR_FIX_4K_E0000, 0);