summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorPolina Dudnik <pdudnik@gmail.com>2009-08-14 15:30:25 -0500
committerPolina Dudnik <pdudnik@gmail.com>2009-08-14 15:30:25 -0500
commitee3226d973d696a5b0838364be649d0abd514c60 (patch)
treeaa6412a725553e8ae51fcca8e4174fed3292f2f6 /src/mem
parent0b0f47ec1664fc6338f5cfe793f8199de4828184 (diff)
parentbcaf93d182f43bf72d52104bb909324945904120 (diff)
downloadgem5-ee3226d973d696a5b0838364be649d0abd514c60.tar.xz
Merge with current branch
Diffstat (limited to 'src/mem')
-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]