From 7ab550044c6f0f202c2c0b35f869bfd4afd7efbc Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 8 Feb 2010 15:54:14 -0500 Subject: [PATCH] port to trace format 2.4 --- libust/tracer.h | 2 +- libust/tracercore.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libust/tracer.h b/libust/tracer.h index e4ff21e..431a77c 100644 --- 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 3113383..79c2dbf 100644 --- 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 -- 2.34.1