Remove TRACEPOINT_INCLUDE_FILE macro

[lttng-ust.git] / liblttng-ust / rculfhash.c

diff --git a/liblttng-ust/rculfhash.c b/liblttng-ust/rculfhash.c
index cd1c8ed0994c3db4fda7acaa9e1f9f1ca66172de..de90d71051133d129fd39cfeab927a6aa3bb8b1a 100644 (file)
--- a/liblttng-ust/rculfhash.c
+++ b/liblttng-ust/rculfhash.c
@@ -256,6 +256,7 @@
 #include <sched.h>
 #include <unistd.h>
 
+#include <lttng/ust-arch.h>
 #include <lttng/urcu/pointer.h>
 #include <urcu/arch.h>
 #include <urcu/uatomic.h>
@@ -333,7 +334,8 @@ void lttng_ust_lfht_iter_debug_set_ht(struct lttng_ust_lfht *ht, struct lttng_us
 #else
 
 static
-void lttng_ust_lfht_iter_debug_set_ht(struct lttng_ust_lfht *ht, struct lttng_ust_lfht_iter *iter)
+void lttng_ust_lfht_iter_debug_set_ht(struct lttng_ust_lfht *ht __attribute__((unused)),
+               struct lttng_ust_lfht_iter *iter __attribute__((unused)))
 {
 }
 
@@ -405,7 +407,7 @@ unsigned long bit_reverse_ulong(unsigned long v)
  * Returns 0 if no bit is set, else returns the position of the most
  * significant bit (from 1 to 32 on 32-bit, from 1 to 64 on 64-bit).
  */
-#if defined(__i386) || defined(__x86_64)
+#if defined(LTTNG_UST_ARCH_X86)
 static inline
 unsigned int fls_u32(uint32_t x)
 {
@@ -421,7 +423,7 @@ unsigned int fls_u32(uint32_t x)
 #define HAS_FLS_U32
 #endif
 
-#if defined(__x86_64)
+#if defined(LTTNG_UST_ARCH_AMD64)
 static inline
 unsigned int fls_u64(uint64_t x)
 {
@@ -438,7 +440,10 @@ unsigned int fls_u64(uint64_t x)
 #endif
 
 #ifndef HAS_FLS_U64
-static __attribute__((unused))
+static
+unsigned int fls_u64(uint64_t x)
+       __attribute__((unused));
+static
 unsigned int fls_u64(uint64_t x)
 {
        unsigned int r = 64;
@@ -475,7 +480,10 @@ unsigned int fls_u64(uint64_t x)
 #endif
 
 #ifndef HAS_FLS_U32
-static __attribute__((unused))
+static
+unsigned int fls_u32(uint32_t x)
+       __attribute__((unused));
+static
 unsigned int fls_u32(uint32_t x)
 {
        unsigned int r = 32;
@@ -1098,7 +1106,8 @@ void lttng_ust_lfht_lookup(struct lttng_ust_lfht *ht, unsigned long hash,
        iter->next = next;
 }
 
-void lttng_ust_lfht_next_duplicate(struct lttng_ust_lfht *ht, lttng_ust_lfht_match_fct match,
+void lttng_ust_lfht_next_duplicate(struct lttng_ust_lfht *ht __attribute__((unused)),
+               lttng_ust_lfht_match_fct match,
                const void *key, struct lttng_ust_lfht_iter *iter)
 {
        struct lttng_ust_lfht_node *node, *next;
@@ -1132,7 +1141,8 @@ void lttng_ust_lfht_next_duplicate(struct lttng_ust_lfht *ht, lttng_ust_lfht_mat
        iter->next = next;
 }
 
-void lttng_ust_lfht_next(struct lttng_ust_lfht *ht, struct lttng_ust_lfht_iter *iter)
+void lttng_ust_lfht_next(struct lttng_ust_lfht *ht __attribute__((unused)),
+               struct lttng_ust_lfht_iter *iter)
 {
        struct lttng_ust_lfht_node *node, *next;