Make __ARCH_HAS_FEATHER_TRACE a proper CONFIG_ variable.

The idea of the Feather-Trace default implementation is that LITMUS^RT should
work without a specialized Feather-Trace implementation present. This was
actually broken.

Changes litmus/feather_trace.h to only include asm/feather_trace.h if actually
promised by the architecture.

6 files changed, 11 insertions, 11 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 12fbd5b65f1f..955ad4089a7a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2126,4 +2126,7 @@ source "arch/x86/kvm/Kconfig"
 
 source "lib/Kconfig"
 
+config ARCH_HAS_FEATHER_TRACE
+        def_bool y
+
 source "litmus/Kconfig"
diff --git a/arch/x86/include/asm/feather_trace_32.h b/arch/x86/include/asm/feather_trace_32.h
index 192cd09b7850..70202f90f169 100644
--- a/arch/x86/include/asm/feather_trace_32.h
+++ b/arch/x86/include/asm/feather_trace_32.h
@@ -77,4 +77,3 @@
             "2:                                           \n\t" \
         : : "r" (p), "r" (p2), "r" (p3)  : CLOBBER_LIST)
 
-#define __ARCH_HAS_FEATHER_TRACE
diff --git a/arch/x86/include/asm/feather_trace_64.h b/arch/x86/include/asm/feather_trace_64.h
index 1cffa4eec5f4..54ac2aeb3a28 100644
--- a/arch/x86/include/asm/feather_trace_64.h
+++ b/arch/x86/include/asm/feather_trace_64.h
@@ -65,5 +65,3 @@
             _EVENT_TABLE(id,1b,2f) \
             "2:                                           \n\t" \
         : : "r" (p), "r" (p2), "r" (p3)  : CLOBBER_LIST)
-
-#define __ARCH_HAS_FEATHER_TRACE
diff --git a/arch/x86/kernel/ft_event.c b/arch/x86/kernel/ft_event.c
index e07ee30dfff9..da9b3ccb7259 100644
--- a/arch/x86/kernel/ft_event.c
+++ b/arch/x86/kernel/ft_event.c
@@ -2,7 +2,6 @@
 
 #include <litmus/feather_trace.h>
 
-#ifdef __ARCH_HAS_FEATHER_TRACE
 /* the feather trace management functions assume
  * exclusive access to the event table
  */
@@ -107,6 +106,3 @@ int ft_is_event_enabled(unsigned long id)
         }
         return 0;
 }
-
-#endif
-
diff --git a/include/litmus/feather_trace.h b/include/litmus/feather_trace.h
index 7d27e763406f..f3bbfa0935ef 100644
--- a/include/litmus/feather_trace.h
+++ b/include/litmus/feather_trace.h
@@ -2,7 +2,6 @@
 #define _FEATHER_TRACE_H_
 
 #include <asm/atomic.h>
-#include <asm/feather_trace.h>
 
 int ft_enable_event(unsigned long id);
 int ft_disable_event(unsigned long id);
@@ -20,7 +19,12 @@ static inline int fetch_and_dec(int *val)
         return atomic_sub_return(1, (atomic_t*) val) + 1;
 }
 
-#ifndef __ARCH_HAS_FEATHER_TRACE
+#ifdef CONFIG_ARCH_HAS_FEATHER_TRACE
+
+#include <asm/feather_trace.h>
+
+#else /* !__ARCH_HAS_FEATHER_TRACE */
+
 /* provide default implementation */
 
 #define feather_callback
@@ -44,6 +48,6 @@ extern int ft_events[MAX_EVENTS];
 #define ft_event3(id, callback, p, p2, p3) \
         if (ft_events[id]) callback(id, p, p2, p3);
 
-#endif
+#endif /* __ARCH_HAS_FEATHER_TRACE */
 
 #endif
diff --git a/litmus/ft_event.c b/litmus/ft_event.c
index 6084b6d6b364..58124fe0ad90 100644
--- a/litmus/ft_event.c
+++ b/litmus/ft_event.c
@@ -2,7 +2,7 @@
 
 #include <litmus/feather_trace.h>
 
-#ifndef __ARCH_HAS_FEATHER_TRACE
+#ifndef CONFIG_ARCH_HAS_FEATHER_TRACE
 /* provide dummy implementation */
 
 int ft_events[MAX_EVENTS];