summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-02-24 15:59:29 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-02-24 15:59:29 -0500
commit107233adf166ef9a376358283073c697686e07c7 (patch)
tree896094ea8ff74b9db28158d27ef83be9890c1129
parentfcf52e854347b7f64fc9c0598e21c2b0ee1e2197 (diff)
parentd5d41d696c0b47d7f2290f054b638495b88af98a (diff)
downloadgem5-107233adf166ef9a376358283073c697686e07c7.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- extra : convert_revision : a63405fac7237014c4ef8b765d31d59d3e1bb500
-rw-r--r--sim/pyconfig/m5config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py
index 6393fb0b8..50032476c 100644
--- 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)