summaryrefslogtreecommitdiff
path: root/cpu/simple_cpu/simple_cpu.cc
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2003-10-14 16:53:52 -0400
committerNathan Binkert <binkertn@umich.edu>2003-10-14 16:53:52 -0400
commit638a07d15a149b48c854b58e2b3f4df097aa5e2e (patch)
tree82ac6aa2e2df719eeb2c8b6d319c4c7956bbc6b1 /cpu/simple_cpu/simple_cpu.cc
parent2ac3dc5aa184da9fa08a304c67d646197ed9a7c5 (diff)
parent4759c203c774ef42a2a35832e220a95cffb5fa7b (diff)
downloadgem5-638a07d15a149b48c854b58e2b3f4df097aa5e2e.tar.xz
Merge
cpu/pc_event.cc: SCCS merged --HG-- extra : convert_revision : f7046f2bf6053be9b00150390fabe3d4f82b0981
Diffstat (limited to 'cpu/simple_cpu/simple_cpu.cc')
-rw-r--r--cpu/simple_cpu/simple_cpu.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index 2bbd74efa..8da4b1641 100644
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -150,7 +150,7 @@ SimpleCPU::SimpleCPU(const string &_name, Process *_process,
_status = Idle;
}
else {
- system->initBootContext(xc);
+ system->init(xc);
// Reset the system
//