X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracercore.h;h=79c2dbf9d3635f134dcb893154b9f5509e31f580;hb=7ab550044c6f0f202c2c0b35f869bfd4afd7efbc;hp=8dfffa13f2c0750ca2d9b9a0bf5e739bb9479a3e;hpb=8fc2d8db78e961acc2ce7fb8f2acea5f58edf408;p=lttng-ust.git

diff --git a/libust/tracercore.h b/libust/tracercore.h
index 8dfffa13..79c2dbf9 100644
--- a/libust/tracercore.h
+++ b/libust/tracercore.h
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef LTT_CORE_H
-#define LTT_CORE_H
+#ifndef UST_TRACERCORE_H
+#define UST_TRACERCORE_H
 
-#include "kernelcompat.h"
+#include <ust/kernelcompat.h>
 //ust// #include <linux/percpu.h>
 
 /* ltt's root dir in debugfs */
@@ -41,11 +41,6 @@ struct ltt_traces {
 
 extern struct ltt_traces ltt_traces;
 
-/*
- * get dentry of ltt's root dir
- */
-struct dentry *get_ltt_root(void);
-
 /* Keep track of trap nesting inside LTT */
 //ust// DECLARE_PER_CPU(unsigned int, ltt_nesting);
 extern unsigned int ltt_nesting;
@@ -66,8 +61,7 @@ extern void ltt_filter_unregister(void);
  */
 static inline unsigned int ltt_align(size_t align_drift, size_t size_of_type)
 {
-	size_t alignment = min(sizeof(void *), size_of_type);
-	return (alignment - align_drift) & (alignment - 1);
+	return (size_of_type - align_drift) & (size_of_type - 1);
 }
 /* Default arch alignment */
 #define LTT_ALIGN
@@ -93,4 +87,4 @@ static inline int ltt_get_alignment(void)
 }
 #endif /* defined(CONFIG_LTT) && defined(CONFIG_LTT_ALIGNMENT) */
 
-#endif /* LTT_CORE_H */
+#endif /* UST_TRACERCORE_H */