1 files changed, 7 insertions, 3 deletions

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