summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-02-29 22:56:59 -0500
committerNathan Binkert <binkertn@umich.edu>2004-02-29 22:56:59 -0500
commit123513ab0d539eb9f49a0b6f76c94a58b5924c2b (patch)
tree6e7741f5d14940fa37460298255483a7bef705d4
parentcbc42f1d71323fa94ad2b5262258c1d6b1c0b0bf (diff)
parent31ccbde8299239718ba5fc45387c30d5ccb045a7 (diff)
downloadgem5-123513ab0d539eb9f49a0b6f76c94a58b5924c2b.tar.xz
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest --HG-- extra : convert_revision : ba093baca9abfe311621e9589fcec0a892e9f9d1
-rw-r--r--cpu/base_cpu.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc
index 19dd11598..367662f25 100644
--- a/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@ -185,9 +185,11 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU)
#endif
}
+#ifdef FULL_SYSTEM
for (int i = 0; i < NumInterruptLevels; ++i)
interrupts[i] = oldCPU->interrupts[i];
intstatus = oldCPU->intstatus;
+#endif
}