X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fcore.h;h=e781a3a6c5542e85f98898ee8beb3314be8869a8;hb=9508e4d5ffbb4ba602d15de0fa7843a004b02f02;hp=8cedf98903e7817fd2f3555fc9d6f976eace389c;hpb=f7b16408b00ecce757bdde940853a48534b25edd;p=ust.git

diff --git a/include/ust/core.h b/include/ust/core.h
index 8cedf98..e781a3a 100644
--- a/include/ust/core.h
+++ b/include/ust/core.h
@@ -119,11 +119,6 @@ static inline long IS_ERR(const void *ptr)
 
 #define zmalloc(s) calloc(1, s)
 
-/* ATTRIBUTES */
-
-/* FIXME: define this */
-#define ____cacheline_aligned
-
 /* MATH */
 
 #include <ust/processor.h>
@@ -146,7 +141,7 @@ static __inline__ int get_count_order(unsigned int count)
 	return order;
 }
 
-#define container_of(ptr, type, member) ({                      \
+#define _ust_container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})