SimpleCPU compiles with merge.

arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/alpha/process.cc:
arch/alpha/process.hh:
arch/alpha/tru64/process.cc:
base/chunk_generator.hh:
base/loader/elf_object.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.cc:
kern/linux/linux.hh:
kern/tru64/tru64.hh:
mem/packet.hh:
mem/page_table.cc:
mem/page_table.hh:
mem/physical.cc:
mem/request.hh:
mem/translating_port.cc:
sim/process.hh:
sim/system.cc:
    Fixing merged changes.

--HG--
extra : convert_revision : 2e94f21009395db654880fcb94ec806b6f5772c3

1 files changed, 2 insertions, 1 deletions

diff --git a/mem/page_table.hh b/mem/page_table.hh
index d318783be..8f0842f58 100644
--- a/mem/page_table.hh
+++ b/mem/page_table.hh
@@ -37,6 +37,7 @@
 #include <string>
 #include <map>
 
+#include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "mem/request.hh"
 #include "mem/packet.hh"
@@ -59,7 +60,7 @@ class PageTable
 
   public:
 
-    PageTable(System *_system, Addr _pageSize = VMPageSize);
+    PageTable(System *_system, Addr _pageSize = TheISA::VMPageSize);
 
     ~PageTable();