diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-22 14:41:49 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-22 14:41:49 +0200 |
| commit | 9a8aae605b80fc0a830cdce747eed48e11acc067 (patch) | |
| tree | c3d138d0c96f9303ec117398f9b96c256f9a09f3 /kernel | |
| parent | Merge branch 'kvm-arm64/ptp' into kvmarm-master/next (diff) | |
| parent | perf: Get rid of oprofile leftovers (diff) | |
| download | linux-9a8aae605b80fc0a830cdce747eed48e11acc067.tar.xz linux-9a8aae605b80fc0a830cdce747eed48e11acc067.zip | |
Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 03db40f6cba9..88cb0ba5690b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -580,11 +580,6 @@ static u64 perf_event_time(struct perf_event *event); void __weak perf_event_print_debug(void) { } -extern __weak const char *perf_pmu_name(void) -{ - return "pmu"; -} - static inline u64 perf_clock(void) { return local_clock(); |