From adc901690da6351c7e23f9ea56f56ef4d3fe73f2 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 3 Mar 2009 13:53:07 -0500 Subject: [PATCH] --- yaml --- r: 140847 b: refs/heads/master c: e3d6bf0a0781a269f34250fd41e0d3dbfe540cf1 h: refs/heads/master i: 140845: 69ac126c5bf05f397b37bdcd37f48117eeee08f5 140843: 43d39f91f327ae4ec9932b6e1eaad228d857e05e 140839: 3de68e5fdc85406f8ee85c887d1874188b3c8c1a 140831: f8c4606948338f87e2eac961ca1c3dc07fbbc89c v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 678f562703ac..e89074e36487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef7a4a161472b952941bf78855a9cd95703c024e +refs/heads/master: e3d6bf0a0781a269f34250fd41e0d3dbfe540cf1 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index 2ad6bae95a3d..27cf834d8b4e 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -132,7 +132,7 @@ void ring_buffer_normalize_time_stamp(int cpu, u64 *ts) } EXPORT_SYMBOL_GPL(ring_buffer_normalize_time_stamp); -#define RB_EVNT_HDR_SIZE (sizeof(struct ring_buffer_event)) +#define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) #define RB_ALIGNMENT 4U #define RB_MAX_SMALL_DATA 28