diff options
| author |   Robert Richter <robert.richter@amd.com> | 2010-10-11 19:38:39 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-11 19:38:39 +0200 |
| commit | 0361e02342f60b64a7075755d5851ed4e6f98c7d (patch) | |
| tree | 76ca78323ad1d4b1ecf1e8137f6b48eddcbebe3a /kernel | |
| parent | oprofile: Remove duplicate code around __oprofilefs_create_file() (diff) | |
| parent | oprofile, ARM: Use oprofile_arch_exit() to cleanup on failure (diff) | |
Merge branch 'oprofile/perf' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
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 db5b56064687..fc512684423f 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -85,6 +85,11 @@ void __weak hw_perf_enable(void) { barrier(); } void __weak perf_event_print_debug(void) { } +extern __weak const char *perf_pmu_name(void) +{ + return "pmu"; +} + static DEFINE_PER_CPU(int, perf_disable_count); void perf_disable(void) |