2 files changed, 2 insertions, 8 deletions
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index 06bf41bd1..b447216d9 100644
--- a/src/arch/x86/interrupts.cc
+++ b/src/arch/x86/interrupts.cc
@@ -614,6 +614,8 @@ X86ISA::Interrupts::Interrupts(Params * p)
     regs[APIC_DESTINATION_FORMAT] = (uint32_t)(-1);
     ISRV = 0;
     IRRV = 0;
+
+    regs[APIC_VERSION] = (5 << 16) | 0x14;
 }
 
 
diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index 13019e90e..b00e6867f 100644
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -84,14 +84,6 @@ initCPU(ThreadContext *tc, int cpuId)
     // passed. No BIST actually runs, but software may still check this
     // register for errors.
     tc->setIntReg(INTREG_RAX, 0);
-
-    Interrupts * interrupts = dynamic_cast<Interrupts *>(
-            tc->getCpuPtr()->getInterruptController(0));
-    assert(interrupts);
-
-    interrupts->setRegNoEffect(APIC_ID, cpuId << 24);
-
-    interrupts->setRegNoEffect(APIC_VERSION, (5 << 16) | 0x14);
 }
 
 void startupCPU(ThreadContext *tc, int cpuId)