[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-02a9d03772aa1ff33a26180a2da0bfb191240eda@git.kernel.org>
Date: Tue, 23 Nov 2010 19:52:06 GMT
From: tip-bot for Rabin Vincent <rabin@....in>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, paulus@...ba.org,
hpa@...or.com, mingo@...hat.com, tzanussi@...il.com, rabin@....in,
a.p.zijlstra@...llo.nl, imunsie@....ibm.com, tglx@...utronix.de,
tom.leiming@...il.com, mingo@...e.hu
Subject: [tip:perf/urgent] perf symbols: Remove incorrect open-coded container_of()
Commit-ID: 02a9d03772aa1ff33a26180a2da0bfb191240eda
Gitweb: http://git.kernel.org/tip/02a9d03772aa1ff33a26180a2da0bfb191240eda
Author: Rabin Vincent <rabin@....in>
AuthorDate: Tue, 23 Nov 2010 22:08:18 +0530
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 23 Nov 2010 16:30:32 -0200
perf symbols: Remove incorrect open-coded container_of()
At least on ARM, padding is inserted between rb_node and sym in struct
symbol_name_rb_node, causing "((void *)sym) - sizeof(struct rb_node)" to
point inside rb_node rather than to the symbol_name_rb_node. Fix this
by converting the code to use container_of().
Cc: Ian Munsie <imunsie@....ibm.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Ming Lei <tom.leiming@...il.com>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tom Zanussi <tzanussi@...il.com>
LKML-Reference: <20101123163106.GA25677@...ian>
Signed-off-by: Rabin Vincent <rabin@....in>
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/symbol.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index b39f499..0500895 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -295,7 +295,9 @@ static void symbols__insert_by_name(struct rb_root *self, struct symbol *sym)
{
struct rb_node **p = &self->rb_node;
struct rb_node *parent = NULL;
- struct symbol_name_rb_node *symn = ((void *)sym) - sizeof(*parent), *s;
+ struct symbol_name_rb_node *symn, *s;
+
+ symn = container_of(sym, struct symbol_name_rb_node, sym);
while (*p != NULL) {
parent = *p;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists