lkml.org 
[lkml]   [2010]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    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@rab.in>
    AuthorDate: Tue, 23 Nov 2010 22:08:18 +0530
    Committer: Arnaldo Carvalho de Melo <acme@redhat.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@au1.ibm.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Ming Lei <tom.leiming@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Tom Zanussi <tzanussi@gmail.com>
    LKML-Reference: <20101123163106.GA25677@debian>
    Signed-off-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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;

    \
     
     \ /
      Last update: 2010-11-23 20:55    [W:0.044 / U:31.452 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site