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.

4 files changed, 3 insertions, 7 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 56b90e5884bc..772c1d6c2819 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2101,4 +2101,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
-