X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=libringbuffer%2Fbackend_internal.h;h=050c98ac530dfc34f267ff9f23cb9bf8db84bbfd;hb=6d940e0f88f76cd19717c3421929de05a7c8ac94;hp=373e3147e383c143dc7273253d584f922a421a50;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index 373e3147..050c98ac 100644
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -448,7 +448,7 @@ do {								\
 
 /* arch-agnostic implementation */
 
-static inline int fls(unsigned int x)
+static inline int lttng_ust_fls(unsigned int x)
 {
 	int r = 32;
 
@@ -481,7 +481,7 @@ static inline int get_count_order(unsigned int count)
 {
 	int order;
 
-	order = fls(count) - 1;
+	order = lttng_ust_fls(count) - 1;
 	if (count & (count - 1))
 		order++;
 	return order;