merge

diff --cc src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
index aa176d0f15af3000fd24212a6dbf751503d07bba,83020742e2dfea75cca7f0a38055c260dd928723..e20b7249efceaf1e4aab1d21874946076fadcae4
--- 1/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
--- 2/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
+++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
@@@ -79,9 -80,15 +87,17 @@@ num_l2_banks.times { |n
      net_ports << MOESI_CMP_directory_L2CacheController.new("L2CacheController_"+n.to_s,
                                                             "L2Cache",
                                                             cache)
 +    net_ports.last.request_latency = l2_cache_latency + 2
 +    net_ports.last.response_latency = l2_cache_latency + 2
    end
+ 
+   if protocol == "MESI_CMP_directory"
+     net_ports << MESI_CMP_directory_L2CacheController.new("L2CacheController_"+n.to_s,
+                                                            "L2Cache",
+                                                            cache)
+   end
+ 
+ 
  }
  num_memories.times { |n|
    directory = DirectoryMemory.new("DirectoryMemory_"+n.to_s, memory_size_mb/num_memories)

diff --cc src/mem/ruby/config/cfg.rb
Simple merge

diff --cc src/mem/ruby/config/defaults.rb
Simple merge