summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2012-03-01 11:37:02 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2012-03-01 11:37:02 -0600
commitc80af04d7df7586352841a65a4398baf21e0c122 (patch)
tree60292236eecafe541bc47bb9b987e6fb7d067dae /configs
parente11847bfa949481322f2031049402a093ed442a7 (diff)
downloadgem5-c80af04d7df7586352841a65a4398baf21e0c122.tar.xz
x86: Fix switching of CPUs
This patch prevents creation of interrupt controller for cpus that will be switched in later
Diffstat (limited to 'configs')
-rw-r--r--configs/common/CacheConfig.py1
-rw-r--r--configs/example/fs.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/common/CacheConfig.py b/configs/common/CacheConfig.py
index b9192fcbf..009cb1bf6 100644
--- a/configs/common/CacheConfig.py
+++ b/configs/common/CacheConfig.py
@@ -70,6 +70,7 @@ def config_cache(options, system):
PageTableWalkerCache())
else:
system.cpu[i].addPrivateSplitL1Caches(icache, dcache)
+ system.cpu[i].createInterruptController()
if options.l2cache:
system.cpu[i].connectAllPorts(system.tol2bus, system.membus)
else:
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 4c2aeeefe..41b4a75ae 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -188,6 +188,7 @@ if len(bm) == 2:
drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1])
drive_sys.cpu = DriveCPUClass(cpu_id=0)
+ drive_sys.cpu.createInterruptController()
drive_sys.cpu.connectAllPorts(drive_sys.membus)
if options.fastmem:
drive_sys.cpu.physmem_port = drive_sys.physmem.port