diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-10-16 20:17:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-16 20:17:25 +0200 |
| commit | f92f6e6ee35d2779aa62e70f78ad8e1cd417eb52 (patch) | |
| tree | 1e8e2ee34678a43d416c4bab58f9ca91673d4444 /kernel | |
| parent | Merge branch 'tip/perf/recordmcount' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core (diff) | |
| parent | oprofile: make !CONFIG_PM function stubs static inline (diff) | |
| download | wireguard-linux-f92f6e6ee35d2779aa62e70f78ad8e1cd417eb52.tar.xz wireguard-linux-f92f6e6ee35d2779aa62e70f78ad8e1cd417eb52.zip | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/perf_event.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 64507eaa2d9e..1ec3916ffef0 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -63,6 +63,11 @@ static atomic64_t perf_event_id; void __weak perf_event_print_debug(void) { } +extern __weak const char *perf_pmu_name(void) +{ + return "pmu"; +} + void perf_pmu_disable(struct pmu *pmu) { int *count = this_cpu_ptr(pmu->pmu_disable_count); |