1 files changed, 12 insertions, 13 deletions

diff --git a/include/litmus/feather_trace.h b/include/litmus/feather_trace.h
index eef8af7a414e..7d27e763406f 100644
--- a/include/litmus/feather_trace.h
+++ b/include/litmus/feather_trace.h
@@ -1,6 +1,7 @@
 #ifndef _FEATHER_TRACE_H_
 #define _FEATHER_TRACE_H_
 
+#include <asm/atomic.h>
 #include <asm/feather_trace.h>
 
 int ft_enable_event(unsigned long id);
@@ -8,6 +9,17 @@ int ft_disable_event(unsigned long id);
 int ft_is_event_enabled(unsigned long id);
 int ft_disable_all_events(void);
 
+/* atomic_* funcitons are inline anyway */
+static inline int fetch_and_inc(int *val)
+{
+        return atomic_add_return(1, (atomic_t*) val) - 1;
+}
+
+static inline int fetch_and_dec(int *val)
+{
+        return atomic_sub_return(1, (atomic_t*) val) + 1;
+}
+
 #ifndef __ARCH_HAS_FEATHER_TRACE
 /* provide default implementation */
 
@@ -32,19 +44,6 @@ extern int ft_events[MAX_EVENTS];
 #define ft_event3(id, callback, p, p2, p3) \
         if (ft_events[id]) callback(id, p, p2, p3);
 
-#include <asm/atomic.h>
-
-static inline int fetch_and_inc(int *val)
-{
-        return atomic_add_return(1, (atomic_t*) val) - 1;
-}
-
-static inline int fetch_and_dec(int *val)
-{
-        return atomic_sub_return(1, (atomic_t*) val) + 1;
-}
-
 #endif
 
-
 #endif