summaryrefslogtreecommitdiff
path: root/kern/freebsd
diff options
context:
space:
mode:
authorBenjamin Nash <benash@umich.edu>2005-07-28 13:16:45 -0400
committerBenjamin Nash <benash@umich.edu>2005-07-28 13:16:45 -0400
commita115249eb07f6e3c9666bf408e214fcd38a665fb (patch)
tree21ea53a2698dc89fdc7f26fc81d45db6d69fbe4f /kern/freebsd
parent648c3beb1d4735e423e77f5189c27c28e5b34493 (diff)
parent74fd4f68c5a7df2efba11497ba1ab5ab62b0b1bf (diff)
downloadgem5-a115249eb07f6e3c9666bf408e214fcd38a665fb.tar.xz
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
into zed.eecs.umich.edu:/z/benash/bk/m5 SConscript: dev/ide_disk.hh: Formatting. dev/ide_ctrl.cc: Endianness dev/ide_disk.cc: dev/pcidev.cc: dev/tsunami_io.cc: dev/uart8250.cc: Clean up code. --HG-- extra : convert_revision : cb554f0e3a701371d2106cd7e11a4a22f773acc2
Diffstat (limited to 'kern/freebsd')
-rw-r--r--kern/freebsd/freebsd_system.cc1
-rw-r--r--kern/freebsd/freebsd_system.hh2
2 files changed, 0 insertions, 3 deletions
diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index 2eb80b8e9..3ff5f18ce 100644
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -60,7 +60,6 @@ FreebsdSystem::FreebsdSystem(Params *p)
skipCalibrateClocks = new FreebsdSkipCalibrateClocksEvent(&pcEventQueue, "calibrate_clocks");
if (kernelSymtab->findAddress("calibrate_clocks", addr))
skipCalibrateClocks->schedule(addr + sizeof(MachInst) * 2);
-
}
diff --git a/kern/freebsd/freebsd_system.hh b/kern/freebsd/freebsd_system.hh
index 6b236e52e..6429b5690 100644
--- a/kern/freebsd/freebsd_system.hh
+++ b/kern/freebsd/freebsd_system.hh
@@ -34,9 +34,7 @@
class FreebsdSystem : public System
{
private:
-
SkipFuncEvent *skipDelayEvent;
-
FreebsdSkipCalibrateClocksEvent *skipCalibrateClocks;
public: