litmus config: make itpossible to compile without overhead tracing

Factor out ftdev support from overhead tracing.

3 files changed, 19 insertions, 10 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index b8157e88d8..620d1ac303 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -1,7 +1,7 @@
 #ifndef _SYS_TRACE_H_
 #define _SYS_TRACE_H_
 
-#ifdef CONFIG_FEATHER_TRACE
+#ifdef CONFIG_SCHED_OVERHEAD_TRACE
 
 #include <litmus/feather_trace.h>
 #include <litmus/feather_buffer.h>
@@ -34,7 +34,7 @@ feather_callback void save_timestamp_task(unsigned long event, unsigned long t_p
 
 #define TTIMESTAMP(id, task) ft_event1(id, save_timestamp_task, (unsigned long) task)
 
-#else /* !CONFIG_FEATHER_TRACE */
+#else /* !CONFIG_SCHED_OVERHEAD_TRACE */
 
 #define TIMESTAMP(id)        /* no tracing */
 
diff --git a/litmus/Kconfig b/litmus/Kconfig
index 9a2ab90dec..997f19f336 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -37,8 +37,17 @@ endmenu
 
 menu "Tracing"
 
+config FEATHER_TRACE
+        bool "Feather-Trace Infrastructure"
+        default y
+        help
+          Feather-Trace basic tracing infrastructure. Includes device file
+          driver and instrumentation point support.
+          
+
 config SCHED_TASK_TRACE
         bool "Trace real-time tasks"
+        depends on FEATHER_TRACE
         default y
         help
           Include support for the sched_trace_XXX() tracing functions. This
@@ -63,13 +72,12 @@ config SCHED_DEBUG_TRACE
           Say Yes for debugging.
           Say No for overhead tracing.
 
-config FEATHER_TRACE
-        bool "Feather-Trace Instrumentation Support"
-        default y
+config SCHED_OVERHEAD_TRACE
+        bool "Record timestamps for overhead measurements"
+        depends on FEATHER_TRACE
+        default n
         help
-          Include Feather-Trace trace points. Currently not supported on
-          sparc64.
-
+          Export event stream for overhead tracing.
           Say Yes for overhead tracing.
 
 
diff --git a/litmus/Makefile b/litmus/Makefile
index 45f95d6a0c..b8188cc35a 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -14,6 +14,7 @@ obj-y     = sched_plugin.o litmus.o \
             sched_gq_edf.o \
             sched_gedf.o
 
-obj-$(CONFIG_FEATHER_TRACE) += trace.o ft_event.o ftdev.o
+obj-$(CONFIG_FEATHER_TRACE) += ft_event.o ftdev.o
 obj-$(CONFIG_SCHED_TASK_TRACE) += sched_task_trace.o
-obj-$(CONFIG_SCHED_DEBUG_TRACE) +=  sched_trace.o
\ No newline at end of file
+obj-$(CONFIG_SCHED_DEBUG_TRACE) += sched_trace.o
+obj-$(CONFIG_SCHED_OVERHEAD_TRACE) += trace.o