summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-11-01 04:01:15 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-11-01 04:01:15 -0700
commit7b417d4188c4978ecdeddd04a0b53f60b96d22e1 (patch)
tree34d718a7a80f316eebc2beebed6a750f8456b8d8
parentb6da5e2086b864149d65519333910d41351d4117 (diff)
downloadgem5-7b417d4188c4978ecdeddd04a0b53f60b96d22e1.tar.xz
SE/FS: Get rid of the last use of FULL_SYSTEM in x86.
-rw-r--r--src/arch/x86/interrupts.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index 994e9bce4..28f1ac04d 100644
--- a/src/arch/x86/interrupts.cc
+++ b/src/arch/x86/interrupts.cc
@@ -40,7 +40,6 @@
#include "arch/x86/regs/apic.hh"
#include "arch/x86/interrupts.hh"
#include "arch/x86/intmessage.hh"
-#include "config/full_system.hh"
#include "cpu/base.hh"
#include "debug/LocalApic.hh"
#include "dev/x86/i82094aa.hh"
@@ -48,6 +47,7 @@
#include "dev/x86/south_bridge.hh"
#include "mem/packet_access.hh"
#include "sim/system.hh"
+#include "sim/full_system.hh"
int
divideFromConf(uint32_t conf)
@@ -275,9 +275,8 @@ X86ISA::Interrupts::requestInterrupt(uint8_t vector,
startupVector = vector;
}
}
-#if FULL_SYSTEM //XXX CPU has no wakeup method in SE mode.
- cpu->wakeup();
-#endif
+ if (FullSystem)
+ cpu->wakeup();
}