diff -r bfcf003c988d -r c0285a2ee142 src/cpu/BaseCPU.py
--- a/src/cpu/BaseCPU.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/BaseCPU.py	Fri Aug 03 16:33:53 2012 +0100
@@ -82,7 +82,7 @@
     numThreads = Param.Unsigned(1, "number of HW thread contexts")
 
     function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
+    function_trace_start = Param.Tick(0, "Tick to start function trace")
 
     checker = Param.BaseCPU(NULL, "checker CPU")
 
diff -r bfcf003c988d -r c0285a2ee142 src/cpu/CheckerCPU.py
--- a/src/cpu/CheckerCPU.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/CheckerCPU.py	Fri Aug 03 16:33:53 2012 +0100
@@ -37,5 +37,3 @@
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(True,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
diff -r bfcf003c988d -r c0285a2ee142 src/cpu/inorder/InOrderCPU.py
--- a/src/cpu/inorder/InOrderCPU.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/inorder/InOrderCPU.py	Fri Aug 03 16:33:53 2012 +0100
@@ -62,8 +62,7 @@
     RASSize = Param.Unsigned(16, "RAS size")
 
     instShiftAmt = Param.Unsigned(2, "Number of bits to shift instructions by")
-    functionTrace = Param.Bool(False, "Enable function trace")
-    functionTraceStart = Param.Tick(0, "Cycle to start function trace")
+
     stageTracing = Param.Bool(False, "Enable tracing of each stage in CPU")
 
     multLatency = Param.Unsigned(1, "Latency for Multiply Operations")
diff -r bfcf003c988d -r c0285a2ee142 src/cpu/o3/O3Checker.py
--- a/src/cpu/o3/O3Checker.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/o3/O3Checker.py	Fri Aug 03 16:33:53 2012 +0100
@@ -36,5 +36,3 @@
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(True,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
diff -r bfcf003c988d -r c0285a2ee142 src/cpu/ozone/OzoneCPU.py
--- a/src/cpu/ozone/OzoneCPU.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/ozone/OzoneCPU.py	Fri Aug 03 16:33:53 2012 +0100
@@ -113,9 +113,6 @@
 
     instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
 
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
-
     # If the CheckerCPU is brought back to useability in the OzoneCPU, create a
     # function here called addCheckerCpu() to create a non-NULL Checker and
     # connect its TLBs (if needed)
diff -r bfcf003c988d -r c0285a2ee142 src/cpu/ozone/OzoneChecker.py
--- a/src/cpu/ozone/OzoneChecker.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/ozone/OzoneChecker.py	Fri Aug 03 16:33:53 2012 +0100
@@ -36,5 +36,3 @@
         "Update the checker with the main CPU's state on an error")
     warnOnlyOnLoadError = Param.Bool(False,
         "If a load result is incorrect, only print a warning and do not exit")
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")
diff -r bfcf003c988d -r c0285a2ee142 src/cpu/ozone/SimpleOzoneCPU.py
--- a/src/cpu/ozone/SimpleOzoneCPU.py	Fri Aug 03 14:46:15 2012 +0100
+++ b/src/cpu/ozone/SimpleOzoneCPU.py	Fri Aug 03 16:33:53 2012 +0100
@@ -109,6 +109,3 @@
     numROBEntries = Param.Unsigned("Number of reorder buffer entries")
 
     instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
-
-    function_trace = Param.Bool(False, "Enable function trace")
-    function_trace_start = Param.Tick(0, "Cycle to start function trace")