From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sun, 12 Mar 2006 06:07:58 +0000 (-0500)
Subject: Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
X-Git-Tag: m5_2.0_beta1~185
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18ba0f85486f0dd919064ba2b0ed8c53a7861298;p=gem5.git

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

--HG--
extra : convert_revision : a784e60b7f79d70b09052fc4a8ae35a821d307dc
---

18ba0f85486f0dd919064ba2b0ed8c53a7861298
diff --cc arch/alpha/tru64/process.cc
index d77e7f9e9,ae83bb649..be78cb96e
--- a/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 70a92a604,df76e4ddc..d5f97ee5f
--- a/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"