changeset 612fb55aa968 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=612fb55aa968
description:
Merge with current branch
diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
src/mem/ruby/config/cfg.rb | 2 +-
diffs (12 lines):
diff -r df6d844345f4 -r 612fb55aa968 src/mem/ruby/config/cfg.rb
--- a/src/mem/ruby/config/cfg.rb Fri Aug 14 15:30:07 2009 -0500
+++ b/src/mem/ruby/config/cfg.rb Fri Aug 14 15:30:25 2009 -0500
@@ -309,7 +309,7 @@
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]
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
