update to trace format 2.6

[ust.git] / libust / tracercore.h

diff --git a/libust/tracercore.h b/libust/tracercore.h
index 79c2dbf9d3635f134dcb893154b9f5509e31f580..3113383cfd69184e52cd06f1a81f3b47566f8472 100644 (file)
--- a/libust/tracercore.h
+++ b/libust/tracercore.h
@@ -61,7 +61,8 @@ extern void ltt_filter_unregister(void);
  */
 static inline unsigned int ltt_align(size_t align_drift, size_t size_of_type)
 {
-       return (size_of_type - align_drift) & (size_of_type - 1);
+       size_t alignment = min(sizeof(void *), size_of_type);
+       return (alignment - align_drift) & (alignment - 1);
 }
 /* Default arch alignment */
 #define LTT_ALIGN