summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/DirectoryMemory.cc
diff options
context:
space:
mode:
authorDerek Hower <drh5@cs.wisc.edu>2010-01-22 17:23:21 -0600
committerDerek Hower <drh5@cs.wisc.edu>2010-01-22 17:23:21 -0600
commit589218168c5ae1ed143372e43dbc468369a1bb8f (patch)
tree5e5154c08e7def83b49b16769c213b0e78ea41fb /src/mem/ruby/system/DirectoryMemory.cc
parent1c448e2ab00acb05d368c9de62c5cf08e64c6213 (diff)
parentf7de30ab1a9e1655de8bf7d4c15007a682a2a629 (diff)
downloadgem5-589218168c5ae1ed143372e43dbc468369a1bb8f.tar.xz
Automated merge with ssh://hg@m5sim.org/m5
Diffstat (limited to 'src/mem/ruby/system/DirectoryMemory.cc')
-rw-r--r--src/mem/ruby/system/DirectoryMemory.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc
index e230059ad..9b2a3873c 100644
--- a/src/mem/ruby/system/DirectoryMemory.cc
+++ b/src/mem/ruby/system/DirectoryMemory.cc
@@ -44,7 +44,7 @@
int DirectoryMemory::m_num_directories = 0;
int DirectoryMemory::m_num_directories_bits = 0;
-int DirectoryMemory::m_total_size_bytes = 0;
+uint64_t DirectoryMemory::m_total_size_bytes = 0;
DirectoryMemory::DirectoryMemory(const string & name)
: m_name(name)