Skip to content

Commit

Permalink
perf symbol: Remove arch__symbols__fixup_end()
Browse files Browse the repository at this point in the history
commit a5d20d4 upstream.

Now the generic code can handle kallsyms fixup properly so no need to
keep the arch-functions anymore.

Fixes: 3cf6a32 ("perf symbols: Fix symbol size calculation condition")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20220416004048.1514900-4-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Namhyung Kim authored and Greg Kroah-Hartman committed May 9, 2022
1 parent ea47db3 commit 7d0010f
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 77 deletions.
1 change: 0 additions & 1 deletion tools/perf/arch/arm64/util/Build
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
perf-y += header.o
perf-y += machine.o
perf-y += perf_regs.o
perf-y += tsc.o
perf-y += pmu.o
Expand Down
28 changes: 0 additions & 28 deletions tools/perf/arch/arm64/util/machine.c

This file was deleted.

1 change: 0 additions & 1 deletion tools/perf/arch/powerpc/util/Build
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
perf-y += header.o
perf-y += machine.o
perf-y += kvm-stat.o
perf-y += perf_regs.o
perf-y += mem-events.o
Expand Down
25 changes: 0 additions & 25 deletions tools/perf/arch/powerpc/util/machine.c

This file was deleted.

16 changes: 0 additions & 16 deletions tools/perf/arch/s390/util/machine.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,3 @@ int arch__fix_module_text_start(u64 *start, u64 *size, const char *name)

return 0;
}

/* On s390 kernel text segment start is located at very low memory addresses,
* for example 0x10000. Modules are located at very high memory addresses,
* for example 0x3ff xxxx xxxx. The gap between end of kernel text segment
* and beginning of first module's text segment is very big.
* Therefore do not fill this gap and do not assign it to the kernel dso map.
*/
void arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
{
if (strchr(p->name, '[') == NULL && strchr(c->name, '['))
/* Last kernel symbol mapped to end of page */
p->end = roundup(p->end, page_size);
else
p->end = c->start;
pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end);
}
5 changes: 0 additions & 5 deletions tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@ static int prefix_underscores_count(const char *str)
return tail - str;
}

void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
{
p->end = c->start;
}

const char * __weak arch__normalize_symbol_name(const char *name)
{
return name;
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ const char *arch__normalize_symbol_name(const char *name);
#define SYMBOL_A 0
#define SYMBOL_B 1

void arch__symbols__fixup_end(struct symbol *p, struct symbol *c);
int arch__compare_symbol_names(const char *namea, const char *nameb);
int arch__compare_symbol_names_n(const char *namea, const char *nameb,
unsigned int n);
Expand Down

0 comments on commit 7d0010f

Please sign in to comment.