Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

configs/test/fs.py:
    Hand merge.

--HG--
extra : convert_revision : 78f7c46084f66d52ddfe0386fd7c08de8017331e

diff --cc configs/test/fs.py
index 7e89b7dd488f7aa0b2d1c59e87f0b0da9d93800c,bb97d2c64ad419f1742d077b51d1c593834ad651..5468c5924bef3d24bc054ed444cbc21e49b5ad29
--- 1/configs/test/fs.py
--- 2/configs/test/fs.py
+++ b/configs/test/fs.py
@@@ -100,10 -36,12 +37,12 @@@ else
  
  if options.dual:
      root = DualRoot(
-         MyLinuxAlphaSystem(readfile=script('netperf-stream-nt-client.rcS')),
-         MyLinuxAlphaSystem(readfile=script('netperf-server.rcS')))
+         MyLinuxAlphaSystem(cpu, mem_mode, linux_image),
+         MyLinuxAlphaSystem(cpu2, mem_mode, linux_image))
+     root.client.readfile = script('netperf-stream-nt-client.rcS')
+     root.server.readfile = script('netperf-server.rcS')
  else:
-     root = TsunamiRoot(clock = '1THz', system = MyLinuxAlphaSystem())
 -    root = TsunamiRoot(clock = '2GHz', system = MyLinuxAlphaSystem(cpu, mem_mode, linux_image))
++    root = TsunamiRoot(clock = '1THz', system = MyLinuxAlphaSystem(cpu, mem_mode, linux_image))
  
  m5.instantiate(root)