misc: Merge branch 'release-staging-v21-0' into develop

Change-Id: I0ad043ded56fb848e045057a1e7a56ea39797906
2021-03-18 11:13:14 -07:00
parent 6a7403f1a2 377a96644e
commit 68064d8043
49 changed files with 9819 additions and 226 deletions
--- a/src/arch/generic/mmu.hh
+++ b/src/arch/generic/mmu.hh
@@ -103,7 +103,7 @@ class BaseMMU : public SimObject
        return getTlb(mode)->finalizePhysical(req, tc, mode);
    }

-    void takeOverFrom(BaseMMU *old_mmu);
+    virtual void takeOverFrom(BaseMMU *old_mmu);

  public:
    BaseTLB* dtb;