X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fcore.h;h=e781a3a6c5542e85f98898ee8beb3314be8869a8;hb=1e4b909b682cc34aaa51ee13432c1c23f7e70bab;hp=c6057ea7b0a93e13de955d1c903a4f4cd2f8b3a4;hpb=518d7abb8e3720433c611499f704c3bd9d554102;p=ust.git

diff --git a/include/ust/core.h b/include/ust/core.h
index c6057ea..e781a3a 100644
--- a/include/ust/core.h
+++ b/include/ust/core.h
@@ -115,20 +115,10 @@ static inline long IS_ERR(const void *ptr)
 #define DEFINE_MUTEX(m) pthread_mutex_t (m) = PTHREAD_MUTEX_INITIALIZER;
 #define DECLARE_MUTEX(m) extern pthread_mutex_t (m);
 
-#define mutex_lock(m) pthread_mutex_lock(m)
-
-#define mutex_unlock(m) pthread_mutex_unlock(m)
-
-
 /* MALLOCATION */
 
 #define zmalloc(s) calloc(1, s)
 
-/* ATTRIBUTES */
-
-/* FIXME: define this */
-#define ____cacheline_aligned
-
 /* MATH */
 
 #include <ust/processor.h>
@@ -151,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) );})