diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-06 09:02:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-06 09:02:34 -0400 |
commit | d9b2002c406011164f245de7a81304625989f1c9 (patch) | |
tree | a2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /tools/perf/util/symbol.c | |
parent | c3b32fcbc7f4fd9a9b84718b991b175b0fd53f8c (diff) | |
parent | 906010b2134e14a2e377decbadd357b3d0ab9c6a (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/symbol.c')
-rw-r--r-- | tools/perf/util/symbol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index e3eebdd682d9..582ce72ca4d2 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c | |||
@@ -396,8 +396,7 @@ static inline int elf_sym__is_function(const GElf_Sym *sym) | |||
396 | { | 396 | { |
397 | return elf_sym__type(sym) == STT_FUNC && | 397 | return elf_sym__type(sym) == STT_FUNC && |
398 | sym->st_name != 0 && | 398 | sym->st_name != 0 && |
399 | sym->st_shndx != SHN_UNDEF && | 399 | sym->st_shndx != SHN_UNDEF; |
400 | sym->st_size != 0; | ||
401 | } | 400 | } |
402 | 401 | ||
403 | static inline int elf_sym__is_label(const GElf_Sym *sym) | 402 | static inline int elf_sym__is_label(const GElf_Sym *sym) |