summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-10-10 01:49:46 -0400
committerKevin Lim <ktlim@umich.edu>2006-10-10 01:49:46 -0400
commite5b13138b1e045bb43a443882221b39d820553df (patch)
tree0ca3c0b55e04474dff29d87de4b92f45a6ee1c65
parentbdde892d668e17fb5a67de0e560a85b9092adf9e (diff)
downloadgem5-e5b13138b1e045bb43a443882221b39d820553df.tar.xz
Two minor fixes.
configs/common/SysPaths.py: Undo accidental change. src/SConscript: Fix. --HG-- extra : convert_revision : 665b186cff7d8ae560601ced7ae407a41a16cfea
-rw-r--r--configs/common/SysPaths.py2
-rw-r--r--src/SConscript1
2 files changed, 1 insertions, 2 deletions
diff --git a/configs/common/SysPaths.py b/configs/common/SysPaths.py
index 5098c54ce..2070d11f8 100644
--- a/configs/common/SysPaths.py
+++ b/configs/common/SysPaths.py
@@ -58,7 +58,7 @@ def system():
if not binary.dir:
binary.dir = joinpath(system.dir, 'binaries')
if not disk.dir:
- disk.dir = joinpath('/n/zamp/z/ktlim/local/clean/linux', 'disks')
+ disk.dir = joinpath(system.dir, 'disks')
if not script.dir:
script.dir = joinpath(system.dir, 'boot')
diff --git a/src/SConscript b/src/SConscript
index e75a36ab5..9f88bbeea 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -285,7 +285,6 @@ turbolaser_sources = Split('''
# Syscall emulation (non-full-system) sources
syscall_emulation_sources = Split('''
- cpu/memtest/memtest.cc
mem/translating_port.cc
mem/page_table.cc
sim/process.cc