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

[gem5.git] / sim / syscall_emul.hh

diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh
index 4e4f9a5d7bce6c304e659fa491157c404b81e7ec..f49248dead18ea76e2e35741d596a2ffb5887bc2 100644 (file)
--- a/sim/syscall_emul.hh
+++ b/sim/syscall_emul.hh
@@ -90,9 +90,6 @@ class SyscallDesc {
 
 class BaseBufferArg {
 
-  protected:
-    typedef TheISA::Addr Addr;
-
   public:
 
     BaseBufferArg(Addr _addr, int _size) : addr(_addr), size(_size)
@@ -643,7 +640,7 @@ template <class OS>
 SyscallReturn
 mmapFunc(SyscallDesc *desc, int num, Process *p, ExecContext *xc)
 {
-    TheISA::Addr start = xc->getSyscallArg(0);
+    Addr start = xc->getSyscallArg(0);
     uint64_t length = xc->getSyscallArg(1);
     // int prot = xc->getSyscallArg(2);
     int flags = xc->getSyscallArg(3);