From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 10 May 2012 18:31:28 +0000 (-0400)
Subject: Fix: remove padding field after variable sized array
X-Git-Tag: v2.1.0-rc1~88
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=59ddbd6738770228942732d61f38a19eb7e5f341;p=lttng-ust.git

Fix: remove padding field after variable sized array

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 37fabad3..b6b34470 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -46,7 +46,6 @@
 enum switch_mode { SWITCH_ACTIVE, SWITCH_FLUSH };
 
 /* channel: collection of per-cpu ring buffers. */
-#define RB_CHANNEL_PADDING	64
 struct channel {
 	int record_disabled;
 	unsigned long commit_count_mask;	/*
@@ -61,12 +60,12 @@ struct channel {
 	//wait_queue_head_t read_wait;		/* reader wait queue */
 	int finalized;				/* Has channel been finalized */
 	size_t priv_data_offset;
+	/* Note: padding field is missing */
 	/*
 	 * Associated backend contains a variable-length array. Needs to
 	 * be last member.
 	 */
 	struct channel_backend backend;		/* Associated backend */
-	char padding[RB_CHANNEL_PADDING];
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 /* Per-subbuffer commit counters used on the hot path */