diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-23 09:51:12 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-23 09:51:12 -0400 |
commit | b48ed9b6c2a8a8aa8eb2182acc77239cc8a3358d (patch) | |
tree | cb34a1417433bae6ddb7eb8a42cbb949ea4f6b19 /src/arch/x86/tlb.hh | |
parent | fa32ad4941a80c85513b57a2fa43acb84212e5df (diff) | |
download | gem5-b48ed9b6c2a8a8aa8eb2182acc77239cc8a3358d.tar.xz |
x86: Add missing explicit overrides for X86 devices
Make clang >= 3.5 happy when compiling build/X86/gem5.opt on OSX.
Diffstat (limited to 'src/arch/x86/tlb.hh')
-rw-r--r-- | src/arch/x86/tlb.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh index 6e3eb2eee..53f61dcbc 100644 --- a/src/arch/x86/tlb.hh +++ b/src/arch/x86/tlb.hh @@ -74,7 +74,7 @@ namespace X86ISA typedef X86TLBParams Params; TLB(const Params *p); - void takeOverFrom(BaseTLB *otlb) {} + void takeOverFrom(BaseTLB *otlb) override {} TlbEntry *lookup(Addr va, bool update_lru = true); @@ -89,11 +89,11 @@ namespace X86ISA public: Walker *getWalker(); - void flushAll(); + void flushAll() override; void flushNonGlobal(); - void demapPage(Addr va, uint64_t asn); + void demapPage(Addr va, uint64_t asn) override; protected: uint32_t size; @@ -161,7 +161,7 @@ namespace X86ISA * * @return A pointer to the walker master port */ - virtual BaseMasterPort *getMasterPort(); + BaseMasterPort *getMasterPort() override; }; } |