diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-02-29 20:25:52 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-02-29 20:25:52 -0500 |
| commit | 0a3948bcfd96b16887a5501231890a05bd22c5a3 (patch) | |
| tree | 32c0f6cfd5ee4a670896c9fee01224ed944de62d /kern/tru64/tru64_system.cc | |
| parent | a574c260e35d99eedfe4927b21f8d3e5ca5ce3f5 (diff) | |
| parent | ee967995196739b90c0b1c384d7e245d1dffdc80 (diff) | |
| download | gem5-0a3948bcfd96b16887a5501231890a05bd22c5a3.tar.xz | |
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest
--HG--
extra : convert_revision : b3fd8bcfbaf1e9d09bac8c1403944df36dde671e
Diffstat (limited to 'kern/tru64/tru64_system.cc')
| -rw-r--r-- | kern/tru64/tru64_system.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc index 1cd98fdc1..13f28beab 100644 --- a/kern/tru64/tru64_system.cc +++ b/kern/tru64/tru64_system.cc @@ -604,7 +604,6 @@ Tru64System::breakpoint() return remoteGDB[0]->trap(ALPHA_KENTRY_INT); } -#ifdef FS_MEASURE void Tru64System::populateMap(std::string callee, std::string caller) { @@ -646,7 +645,6 @@ Tru64System::dumpState(ExecContext *xc) const } } } -#endif //FS_MEASURE BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tru64System) @@ -672,7 +670,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tru64System) INIT_PARAM(console_code, "file that contains the console code"), INIT_PARAM(pal_code, "file that contains palcode"), INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot", - "a") + "a") END_INIT_SIM_OBJECT_PARAMS(Tru64System) |