summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Hower <drh5@cs.wisc.edu>2009-08-13 10:37:37 -0500
committerDerek Hower <drh5@cs.wisc.edu>2009-08-13 10:37:37 -0500
commitbcaf93d182f43bf72d52104bb909324945904120 (patch)
tree46b6bdefdd97c8d54629c030134c95468279c970
parent35082a67b65457e36cffdc5f8a13aacaa4258939 (diff)
parentdb40cb8f519259fb30128f7262fba5270424c7f8 (diff)
downloadgem5-bcaf93d182f43bf72d52104bb909324945904120.tar.xz
Automated merge with ssh://hg@m5sim.org/m5
-rw-r--r--src/mem/ruby/config/cfg.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb
index 8ed7de474..445bb4885 100644
--- a/src/mem/ruby/config/cfg.rb
+++ b/src/mem/ruby/config/cfg.rb
@@ -309,7 +309,7 @@ class CacheController < NetPort
cache.controller = self
}
- if !@@total_cache_controllers.has_key?(mach_type)
+ if !@@total_cache_controllers.key?(mach_type)
@@total_cache_controllers[mach_type] = 0
end
@version = @@total_cache_controllers[mach_type]