Automated merge with ssh://hg@m5sim.org/m5

This commit is contained in:
Derek Hower 2009-08-13 10:37:37 -05:00
commit bcaf93d182

View file

@ -309,7 +309,7 @@ class CacheController < NetPort
cache.controller = self cache.controller = self
} }
if !@@total_cache_controllers.has_key?(mach_type) if !@@total_cache_controllers.key?(mach_type)
@@total_cache_controllers[mach_type] = 0 @@total_cache_controllers[mach_type] = 0
end end
@version = @@total_cache_controllers[mach_type] @version = @@total_cache_controllers[mach_type]