Merge fixes to make full system compile and run.
authorKevin Lim <ktlim@umich.edu>
Mon, 12 Jun 2006 21:53:57 +0000 (17:53 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 12 Jun 2006 21:53:57 +0000 (17:53 -0400)
commit841d0b9d40446160fdc1e073e16f9bd7b6501911
tree2842605c1b3371ae6aa75f44207936bc59b5f107
parent3e1537cf8b6a9fdbffa3975fde9f3d7f12c719f9
Merge fixes to make full system compile and run.

src/arch/alpha/linux/system.cc:
src/cpu/o3/alpha_cpu_impl.hh:
src/sim/system.cc:
    Merge fixes.

--HG--
extra : convert_revision : aa3326c0ebf54da9ab1dbd2d9877da41ca487082
src/arch/alpha/linux/system.cc
src/cpu/o3/alpha_cpu_impl.hh
src/sim/system.cc