port to trace format 2.4

diff --git a/libust/tracer.h b/libust/tracer.h
index e4ff21e4044da00aa9e347a1eea0d9cab2ba41e3..431a77c67f00fdb85bdf44238bcf48fd44cd73bd 100644 (file)
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -313,7 +313,7 @@ slow_path:
 #define LTT_DEFAULT_N_SUBBUFS_HIGH     2
 #define LTT_TRACER_MAGIC_NUMBER                0x00D6B7ED
 #define LTT_TRACER_VERSION_MAJOR       2
-#define LTT_TRACER_VERSION_MINOR       3
+#define LTT_TRACER_VERSION_MINOR       4
 
 /**
  * ust_write_trace_header - Write trace header

diff --git a/libust/tracercore.h b/libust/tracercore.h
index 3113383cfd69184e52cd06f1a81f3b47566f8472..79c2dbf9d3635f134dcb893154b9f5509e31f580 100644 (file)
--- a/libust/tracercore.h
+++ b/libust/tracercore.h
@@ -61,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