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

[linux-2.6-microblaze.git] / tools / perf / util / symbol.h

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 6352022..a4f0075 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -60,6 +60,7 @@ struct symbol {
        u8              binding;
        u8              idle:1;
        u8              ignore:1;
+       u8              inlined:1;
        u8              arch_sym;
        char            name[0];
 };
@@ -209,6 +210,7 @@ struct addr_location {
        struct thread *thread;
        struct map    *map;
        struct symbol *sym;
+       const char    *srcline;
        u64           addr;
        char          level;
        u8            filtered;