diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc index f9bfdec929..56ee98ded6 100644 --- a/src/arch/arm/system.cc +++ b/src/arch/arm/system.cc @@ -50,7 +50,6 @@ #include "dev/arm/gic_v2.hh" #include "mem/fs_translating_port_proxy.hh" #include "mem/physical.hh" -#include "sim/full_system.hh" using namespace std; using namespace Linux; @@ -180,13 +179,6 @@ ArmSystem::initState() } } -ArmSystem* -ArmSystem::getArmSystem(ThreadContext *tc) -{ - assert(FullSystem); - return static_cast(tc->getSystemPtr()); -} - bool ArmSystem::haveSecurity(ThreadContext *tc) { diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh index 26b417ed78..6331af283b 100644 --- a/src/arch/arm/system.hh +++ b/src/arch/arm/system.hh @@ -48,6 +48,7 @@ #include "kern/linux/events.hh" #include "params/ArmSystem.hh" #include "params/GenericArmSystem.hh" +#include "sim/full_system.hh" #include "sim/sim_object.hh" #include "sim/system.hh" @@ -274,7 +275,12 @@ class ArmSystem : public System * Returns a valid ArmSystem pointer if using ARM ISA, it fails * otherwise. */ - static ArmSystem* getArmSystem(ThreadContext *tc); + static ArmSystem* + getArmSystem(ThreadContext *tc) + { + assert(FullSystem); + return static_cast(tc->getSystemPtr()); + } /** Returns true if the system of a specific thread context implements the * Security Extensions