From f05f35df99e2b9be3353d7585142b91139965e22 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Wed, 23 Feb 2011 15:10:49 -0600
Subject: Includes: Don't include isa_traits.hh and use the TheISA namespace
 unless really needed.

---
 src/mem/cache/blk.hh             | 1 -
 src/mem/cache/builder.cc         | 1 -
 src/mem/cache/prefetch/tagged.cc | 1 -
 src/mem/physical.cc              | 1 +
 4 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/mem')

diff --git a/src/mem/cache/blk.hh b/src/mem/cache/blk.hh
index 6be09597c..bf17a303a 100644
--- a/src/mem/cache/blk.hh
+++ b/src/mem/cache/blk.hh
@@ -39,7 +39,6 @@
 
 #include "base/printable.hh"
 #include "sim/core.hh"          // for Tick
-#include "arch/isa_traits.hh"   // for Addr
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
diff --git a/src/mem/cache/builder.cc b/src/mem/cache/builder.cc
index bd9eb9acc..d4ef886f0 100644
--- a/src/mem/cache/builder.cc
+++ b/src/mem/cache/builder.cc
@@ -64,7 +64,6 @@
 
 
 using namespace std;
-using namespace TheISA;
 
 #define BUILD_CACHE(TAGS, tags)                         \
     do {                                                \
diff --git a/src/mem/cache/prefetch/tagged.cc b/src/mem/cache/prefetch/tagged.cc
index a6c2403ba..700af3790 100644
--- a/src/mem/cache/prefetch/tagged.cc
+++ b/src/mem/cache/prefetch/tagged.cc
@@ -33,7 +33,6 @@
  * Describes a tagged prefetcher based on template policies.
  */
 
-#include "arch/isa_traits.hh"
 #include "mem/cache/prefetch/tagged.hh"
 
 TaggedPrefetcher::TaggedPrefetcher(const BaseCacheParams *p)
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 937fb80a2..db10e428c 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -53,6 +53,7 @@
 #include <iostream>
 #include <string>
 
+#include "arch/isa_traits.hh"
 #include "arch/registers.hh"
 #include "base/intmath.hh"
 #include "base/misc.hh"
-- 
cgit v1.2.3