Merge zizzer.eecs.umich.edu:/z/stever/bk/m5-head

into zizzer.eecs.umich.edu:/z/stever/bk/m5-py

--HG--
extra : convert_revision : 39f30bd052c0f2b88524311d674bad7a0fae6358

1 files changed, 5 insertions, 4 deletions

diff --git a/python/m5/config.py b/python/m5/config.py
index 5da3da19d..712b0cfd1 100644
--- a/python/m5/config.py
+++ b/python/m5/config.py
@@ -198,12 +198,13 @@ class Proxy(object):
                 raise AttributeError, \
                       'Parent of %s type %s not found at path %s' \
                       % (base.name, ptype, self._path)
-            found, done = obj.find(ptype, self._path)
-            if isinstance(found, Proxy):
-                done = False
+            result, done = obj.find(ptype, self._path)
             obj = obj.parent
 
-        return self._mulcheck(found)
+        if isinstance(result, Proxy):
+            result = result.unproxy(obj, ptype)
+
+        return self._mulcheck(result)
 
     def getindex(obj, index):
         if index == None: