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
2004-03-11 20:04:41 -05:00
parent 3bc8cffc75
commit 256a1ac478
3 changed files with 33 additions and 48 deletions
--- 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));