Merge branch 'linus' into perf/core, to fix conflicts

[linux-2.6-microblaze.git] / tools / perf / util / annotate.c

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index aa66791..da1c4c4 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -49,10 +49,9 @@ struct arch {
        void            *priv;
        unsigned int    model;
        unsigned int    family;
-       int             (*init)(struct arch *arch);
+       int             (*init)(struct arch *arch, char *cpuid);
        bool            (*ins_is_fused)(struct arch *arch, const char *ins1,
                                        const char *ins2);
-       int             (*cpuid_parse)(struct arch *arch, char *cpuid);
        struct          {
                char comment_char;
                char skip_functions_char;
@@ -132,10 +131,10 @@ static struct arch architectures[] = {
        },
        {
                .name = "x86",
+               .init = x86__annotate_init,
                .instructions = x86__instructions,
                .nr_instructions = ARRAY_SIZE(x86__instructions),
                .ins_is_fused = x86__ins_is_fused,
-               .cpuid_parse = x86__cpuid_parse,
                .objdump =  {
                        .comment_char = '#',
                },
@@ -1457,16 +1456,13 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
                *parch = arch;
 
        if (arch->init) {
-               err = arch->init(arch);
+               err = arch->init(arch, cpuid);
                if (err) {
                        pr_err("%s: failed to initialize %s arch priv area\n", __func__, arch->name);
                        return err;
                }
        }
 
-       if (arch->cpuid_parse && cpuid)
-               arch->cpuid_parse(arch, cpuid);
-
        pr_debug("%s: filename=%s, sym=%s, start=%#" PRIx64 ", end=%#" PRIx64 "\n", __func__,
                 symfs_filename, sym->name, map->unmap_ip(map, sym->start),
                 map->unmap_ip(map, sym->end));