764c764,767
< # Cycles in the configuration heirarchy are not supported. This
---
> # Make sure this object is in the configuration hierarchy
> if not self._parent and not isRoot(self):
> raise RuntimeError, "Attempt to instantiate orphan node"
> # Cycles in the configuration hierarchy are not supported. This
770c773
< raise RuntimeError, "%s: Cycle found in configuration heirarchy." \
---
> raise RuntimeError, "%s: Cycle found in configuration hierarchy." \
892a896,899
> def isRoot(obj):
> from m5.objects import Root
> return obj and obj is Root.getInstance()
>