diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-10-09 22:59:56 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-10-09 22:59:56 -0400 |
| commit | bdde892d668e17fb5a67de0e560a85b9092adf9e (patch) | |
| tree | 3876a98dcd7f80aca7bf7e2153dbaa32c83a15b5 /tests/configs/tsunami-simple-timing-dual.py | |
| parent | a9ae6c8656dc233996c81cdeb6f5c8539442af95 (diff) | |
| parent | 5448517da4cd13e3c8438850f04367d9614d686b (diff) | |
| download | gem5-bdde892d668e17fb5a67de0e560a85b9092adf9e.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
src/cpu/memtest/memtest.cc:
src/cpu/memtest/memtest.hh:
src/cpu/simple/timing.hh:
tests/configs/o3-timing-mp.py:
Hand merge.
--HG--
extra : convert_revision : a58cc439eb5e8f900d175ed8b5a85b6c8723e558
Diffstat (limited to 'tests/configs/tsunami-simple-timing-dual.py')
| -rw-r--r-- | tests/configs/tsunami-simple-timing-dual.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/configs/tsunami-simple-timing-dual.py b/tests/configs/tsunami-simple-timing-dual.py index 967d6a2d2..bf94214fd 100644 --- a/tests/configs/tsunami-simple-timing-dual.py +++ b/tests/configs/tsunami-simple-timing-dual.py @@ -34,7 +34,7 @@ import FSConfig AlphaConsole.cpu = Parent.cpu[0] IntrControl.cpu = Parent.cpu[0] -cpus = [ TimingSimpleCPU() for i in xrange(2) ] +cpus = [ TimingSimpleCPU(cpu_id=i) for i in xrange(2) ] system = FSConfig.makeLinuxAlphaSystem('timing') system.cpu = cpus for c in cpus: |