Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : a784e60b7f79d70b09052fc4a8ae35a821d307dc

diff --cc arch/alpha/tru64/process.cc
index d77e7f9e99302695aa0517ec0a8e007565533a58,ae83bb6497a3361489512724e28913bc0419093f..be78cb96e01f45cc1626e84b252eba6b5d3251aa
--- 1/arch/alpha/tru64/process.cc
--- 2/arch/alpha/tru64/process.cc
+++ b/arch/alpha/tru64/process.cc
@@@ -30,7 -30,7 +30,6 @@@
  #include "arch/alpha/tru64/process.hh"
  #include "cpu/exec_context.hh"
  #include "kern/tru64/tru64.hh"
- #include "sim/fake_syscall.hh"
 -#include "mem/functional/functional.hh"
  #include "sim/process.hh"
  #include "sim/syscall_emul.hh"
  

diff --cc sim/process.cc
index 70a92a604c762190b88edc5bd456405290362199,df76e4ddcf6c81b9a365f8d705ee2a2f2aa195e5..d5f97ee5f497a0a0498cd3da412a5fc2cf1e25e3
--- 1/sim/process.cc
--- 2/sim/process.cc
+++ b/sim/process.cc
@@@ -42,11 -42,8 +42,10 @@@
  #include "cpu/smt.hh"
  #include "encumbered/cpu/full/thread.hh"
  #include "encumbered/eio/eio.hh"
 -#include "encumbered/mem/functional/main.hh"
 +#include "mem/page_table.hh"
 +#include "mem/memory.hh"
 +#include "mem/translating_port.hh"
  #include "sim/builder.hh"
- #include "sim/fake_syscall.hh"
  #include "sim/process.hh"
  #include "sim/stats.hh"
  #include "sim/syscall_emul.hh"