port to trace format 2.4

[ust.git] / libust / tracercore.h

diff --git a/libust/tracercore.h b/libust/tracercore.h
index 5a088db65e4e2c5c4e81ec91ecb640da7897aed5..79c2dbf9d3635f134dcb893154b9f5509e31f580 100644 (file)
--- a/libust/tracercore.h
+++ b/libust/tracercore.h
@@ -18,8 +18,8 @@
  * 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 <ust/kernelcompat.h>
 //ust// #include <linux/percpu.h>
@@ -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 */