Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

src/cpu/simple/base.cc:
    Hand merge

--HG--
extra : convert_revision : a2902ef9d917d22ffb9c7dfa2fd444694a65240d

1 files changed, 7 insertions, 8 deletions

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 593baf169..8a87c3a6b 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -38,14 +38,6 @@ class CowIdeDisk(IdeDisk):
     def childImage(self, ci):
         self.image.child.image_file = ci
 
-class CowMmDisk(MmDisk):
-    image = CowDiskImage(child=RawDiskImage(read_only=True),
-                         read_only=False)
-
-    def childImage(self, ci):
-        self.image.child.image_file = ci
-
-
 class BaseTsunami(Tsunami):
     ethernet = NSGigE(configdata=NSGigEPciData(),
                       pci_bus=0, pci_dev=1, pci_func=0)
@@ -87,6 +79,13 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None):
     return self
 
 def makeSparcSystem(mem_mode, mdesc = None):
+    class CowMmDisk(MmDisk):
+        image = CowDiskImage(child=RawDiskImage(read_only=True),
+                             read_only=False)
+
+        def childImage(self, ci):
+            self.image.child.image_file = ci
+
     self = SparcSystem()
     if not mdesc:
         # generic system