diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2004-03-11 20:04:41 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2004-03-11 20:04:41 -0500 |
| commit | 256a1ac478f8da64c6d7d64f04decf2976def2cd (patch) | |
| tree | 2156639dd607b3592a42c9cc1b928bac548ae2e0 /dev | |
| parent | 3bc8cffc75c2e03a6a8fe5f4425940a16405f672 (diff) | |
| download | gem5-256a1ac478f8da64c6d7d64f04decf2976def2cd.tar.xz | |
merge from head of m5. note: i did not bother to merge the PIO stuff with scsi since we're not going that route anymore anyway. esp because it was giving me an error i couldn't seem to fix.
dev/alpha_console.cc:
missed this >>>> after i merged
kern/linux/linux_system.cc:
get rid of FS_MEASURES and change FnEvent to LinuxFnEvent
kern/linux/linux_system.hh:
get rid of FS_MEASURE
--HG--
extra : convert_revision : 210f46573bba0c772a224ce110af9a9230fabf6a
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/alpha_console.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index f592b239d..2e9e09e93 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -58,7 +58,6 @@ AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d, int num_cpus, MemoryController *mmu, Addr a, HierParams *hier, Bus *bus) : PioDevice(name), disk(d), console(cons), addr(a) ->>>>>>> { mmu->add_child(this, Range<Addr>(addr, addr + size)); |