From 6107dd11c60937d04545e7ce34a60d529726d4a7 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Tue, 21 Sep 2021 17:22:54 -0700
Subject: [PATCH] misc: Remove include of arch/page_size.hh, and fix up
 includes.

Remove the only remaining use of arch/page_size.hh, and fix up a couple
files which were using one of the constants defined in a specific arch
version of it without including the file they needed directly.

Change-Id: I6da5638ca10c788bd42197f4f5180e6b66f7b87f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50765
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
---
 src/arch/arm/system.hh                | 1 +
 src/arch/riscv/pagetable_walker.cc    | 1 +
 src/dev/arm/generic_timer.cc          | 1 +
 src/gpu-compute/gpu_compute_driver.cc | 1 +
 src/sim/system.hh                     | 1 -
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh
index 03326b325d..013f7ca32a 100644
--- a/src/arch/arm/system.hh
+++ b/src/arch/arm/system.hh
@@ -46,6 +46,7 @@
 #include <unordered_map>
 #include <vector>
 
+#include "arch/arm/page_size.hh"
 #include "kern/linux/events.hh"
 #include "params/ArmSystem.hh"
 #include "sim/full_system.hh"
diff --git a/src/arch/riscv/pagetable_walker.cc b/src/arch/riscv/pagetable_walker.cc
index bc155246aa..08767c238e 100644
--- a/src/arch/riscv/pagetable_walker.cc
+++ b/src/arch/riscv/pagetable_walker.cc
@@ -53,6 +53,7 @@
 #include <memory>
 
 #include "arch/riscv/faults.hh"
+#include "arch/riscv/page_size.hh"
 #include "arch/riscv/pagetable.hh"
 #include "arch/riscv/tlb.hh"
 #include "base/bitfield.hh"
diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc
index 1c1d811063..f5b46fa18d 100644
--- a/src/dev/arm/generic_timer.cc
+++ b/src/dev/arm/generic_timer.cc
@@ -39,6 +39,7 @@
 
 #include <cmath>
 
+#include "arch/arm/page_size.hh"
 #include "arch/arm/system.hh"
 #include "arch/arm/utility.hh"
 #include "base/logging.hh"
diff --git a/src/gpu-compute/gpu_compute_driver.cc b/src/gpu-compute/gpu_compute_driver.cc
index dd8e140ad8..6101dbeb06 100644
--- a/src/gpu-compute/gpu_compute_driver.cc
+++ b/src/gpu-compute/gpu_compute_driver.cc
@@ -35,6 +35,7 @@
 
 #include <memory>
 
+#include "arch/x86/page_size.hh"
 #include "base/compiler.hh"
 #include "base/logging.hh"
 #include "base/trace.hh"
diff --git a/src/sim/system.hh b/src/sim/system.hh
index f25d279e78..7aeeea7a5d 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -48,7 +48,6 @@
 #include <utility>
 #include <vector>
 
-#include "arch/page_size.hh"
 #include "base/loader/memory_image.hh"
 #include "base/loader/symtab.hh"
 #include "base/statistics.hh"