Sujay Phadke has uploaded this change for review. (
https://gem5-review.googlesource.com/8641
Change subject: Merge branch 'master' of
https://gem5.googlesource.com/public/gem5
......................................................................
Merge branch 'master' of https://gem5.googlesource.com/public/gem5
Change-Id: Ic8f884b1803513eaf032493cc56e5a88b5baf8f8
---
M src/mem/page_table.cc
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index eba174b..d771479 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -84,11 +84,7 @@
new_vaddr, size);
while (size > 0) {
-<<<<<<< HEAD (677e37 scons, arch: gem5.fast does not compile with newer
versions )
-// auto new_it = pTable.find(new_vaddr);
-=======
auto new_it M5_VAR_USED = pTable.find(new_vaddr);
->>>>>>> BRANCH (38a1e2 arch-arm: Make hlt64 a mem barrier with semihosting)
auto old_it = pTable.find(vaddr);
assert(old_it != pTable.end() && new_it == pTable.end());
--
To view, visit https://gem5-review.googlesource.com/8641
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ic8f884b1803513eaf032493cc56e5a88b5baf8f8
Gerrit-Change-Number: 8641
Gerrit-PatchSet: 1
Gerrit-Owner: Sujay Phadke <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
