From d541038549966dcfc8f5923fd8550021b3d72d91 Mon Sep 17 00:00:00 2001
From: Andreas Sandberg <andreas.sandberg@arm.com>
Date: Sun, 21 Jun 2015 20:48:33 +0100
Subject: [PATCH] arm: Cleanup arch headers to remove dma_device.hh dependency

Break the dependency on dma_device.hh by forward-declaring DmaPort in
the relevant header.
---
 src/arch/arm/stage2_mmu.cc   | 1 +
 src/arch/arm/stage2_mmu.hh   | 1 +
 src/arch/arm/table_walker.cc | 3 ++-
 src/arch/arm/table_walker.hh | 3 ++-
 src/arch/arm/tlb.cc          | 3 ++-
 src/arch/arm/tlb.hh          | 1 -
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/arch/arm/stage2_mmu.cc b/src/arch/arm/stage2_mmu.cc
index b7f3d07ab..3525768e0 100755
--- a/src/arch/arm/stage2_mmu.cc
+++ b/src/arch/arm/stage2_mmu.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/arm/stage2_mmu.hh"
+
 #include "arch/arm/faults.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/table_walker.hh"
diff --git a/src/arch/arm/stage2_mmu.hh b/src/arch/arm/stage2_mmu.hh
index 132d1b7f5..b42f213e8 100755
--- a/src/arch/arm/stage2_mmu.hh
+++ b/src/arch/arm/stage2_mmu.hh
@@ -42,6 +42,7 @@
 
 #include "arch/arm/faults.hh"
 #include "arch/arm/tlb.hh"
+#include "dev/dma_device.hh"
 #include "mem/request.hh"
 #include "params/ArmStage2MMU.hh"
 #include "sim/eventq.hh"
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index e92971b7d..f58d8a268 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -37,13 +37,13 @@
  * Authors: Ali Saidi
  *          Giacomo Gabrielli
  */
+#include "arch/arm/table_walker.hh"
 
 #include <memory>
 
 #include "arch/arm/faults.hh"
 #include "arch/arm/stage2_mmu.hh"
 #include "arch/arm/system.hh"
-#include "arch/arm/table_walker.hh"
 #include "arch/arm/tlb.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
@@ -51,6 +51,7 @@
 #include "debug/Drain.hh"
 #include "debug/TLB.hh"
 #include "debug/TLBVerbose.hh"
+#include "dev/dma_device.hh"
 #include "sim/system.hh"
 
 using namespace ArmISA;
diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh
index d9245d595..a5327cd95 100644
--- a/src/arch/arm/table_walker.hh
+++ b/src/arch/arm/table_walker.hh
@@ -46,13 +46,14 @@
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/tlb.hh"
-#include "dev/dma_device.hh"
 #include "mem/request.hh"
 #include "params/ArmTableWalker.hh"
 #include "sim/eventq.hh"
 
 class ThreadContext;
 
+class DmaPort;
+
 namespace ArmISA {
 class Translation;
 class TLB;
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index dfda14d30..9a706a166 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -42,6 +42,8 @@
  *          Steve Reinhardt
  */
 
+#include "arch/arm/tlb.hh"
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -52,7 +54,6 @@
 #include "arch/arm/table_walker.hh"
 #include "arch/arm/stage2_lookup.hh"
 #include "arch/arm/stage2_mmu.hh"
-#include "arch/arm/tlb.hh"
 #include "arch/arm/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh
index fba5775aa..5d418ef17 100644
--- a/src/arch/arm/tlb.hh
+++ b/src/arch/arm/tlb.hh
@@ -50,7 +50,6 @@
 #include "arch/arm/vtophys.hh"
 #include "arch/generic/tlb.hh"
 #include "base/statistics.hh"
-#include "dev/dma_device.hh"
 #include "mem/request.hh"
 #include "params/ArmTLB.hh"
 #include "sim/probe/pmu.hh"
-- 
2.30.2