From: Kevin Lim <ktlim@umich.edu>
Date: Tue, 10 Oct 2006 05:49:46 +0000 (-0400)
Subject: Two minor fixes.
X-Git-Tag: m5_2.0_beta2~104^2~23
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5b13138b1e045bb43a443882221b39d820553df;p=gem5.git

Two minor fixes.

configs/common/SysPaths.py:
    Undo accidental change.
src/SConscript:
    Fix.

--HG--
extra : convert_revision : 665b186cff7d8ae560601ced7ae407a41a16cfea
---

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