merge from head of m5. note: i did not bother to merge the PIO stuff with scsi...
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 12 Mar 2004 01:04:41 +0000 (20:04 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 12 Mar 2004 01:04:41 +0000 (20:04 -0500)
commit256a1ac478f8da64c6d7d64f04decf2976def2cd
tree2156639dd607b3592a42c9cc1b928bac548ae2e0
parent3bc8cffc75c2e03a6a8fe5f4425940a16405f672
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
dev/alpha_console.cc
kern/linux/linux_system.cc
kern/linux/linux_system.hh