Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

--HG-- extra : convert_revision : a63405fac7237014c4ef8b765d31d59d3e1bb500
2005-02-24 15:59:29 -05:00 · 2005-02-24 15:59:29 -05:00 · 107233adf1
commit 107233adf1
parent fcf52e8543 d5d41d696c
1 changed files with 1 additions and 1 deletions
--- a/sim/pyconfig/m5config.py
+++ b/sim/pyconfig/m5config.py
@ -35,7 +35,7 @@ except:
 env = {}
 env.update(os.environ)

-def panic(*args, **kwargs):
+def panic(string):
    print >>sys.stderr, 'panic:', string
    sys.exit(1)