summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-05-04 14:41:36 -0400
committerKevin Lim <ktlim@umich.edu>2005-05-04 14:41:36 -0400
commitc03e97b62d2adbe335a883b5fafa10c973e2c4d1 (patch)
tree8693177258ba24ac957e35ba1a0da97fcbef254b /kern
parent61d95de4c886911fa0b7dc9d587ffe5b292b739e (diff)
parent3b0464127e3512ac0865fa8e6207085d49692ae8 (diff)
downloadgem5-c03e97b62d2adbe335a883b5fafa10c973e2c4d1.tar.xz
Merge ktlim@zizzer:/bk/m5 into zamp.eecs.umich.edu:/z/ktlim2/current/m5
--HG-- extra : convert_revision : b868e7920eaa3682c6123651f0c598673ebb7f22
Diffstat (limited to 'kern')
-rw-r--r--kern/linux/linux_system.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index a9c92b54a..5fa72735c 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -132,8 +132,9 @@ LinuxSystem::LinuxSystem(Params *p)
skipDelayLoopEvent = new LinuxSkipDelayLoopEvent(&pcEventQueue,
"calibrate_delay");
- if (kernelSymtab->findAddress("calibrate_delay", addr))
- skipDelayLoopEvent->schedule(addr+sizeof(MachInst));
+ if (kernelSymtab->findAddress("calibrate_delay", addr)) {
+ skipDelayLoopEvent->schedule(addr + 3 * sizeof(MachInst));
+ }
skipCacheProbeEvent = new SkipFuncEvent(&pcEventQueue,
"determine_cpu_caches");