diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-15 06:10:35 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-15 06:10:35 +0300 |
| commit | a252852afaea8270fcb91628b298253b112fc92e (patch) | |
| tree | 71d0931449a6fba2a4c3a306effe2e7ef15f8541 /include | |
| parent | d91309f69b7bdb64aeb30106fde8d18c5dd354b5 (diff) | |
| parent | d14dd7e20d5e526557f5d3cfef4046a642f80924 (diff) | |
| download | linux-a252852afaea8270fcb91628b298253b112fc92e.tar.xz | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/oprofile.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h index 32fb81212fd1..1ca64113efe8 100644 --- a/include/linux/oprofile.h +++ b/include/linux/oprofile.h @@ -16,6 +16,8 @@ #include <linux/types.h> #include <linux/spinlock.h> #include <linux/init.h> +#include <linux/errno.h> +#include <linux/printk.h> #include <asm/atomic.h> /* Each escaped entry is prefixed by ESCAPE_CODE @@ -186,10 +188,17 @@ int oprofile_add_data(struct op_entry *entry, unsigned long val); int oprofile_add_data64(struct op_entry *entry, u64 val); int oprofile_write_commit(struct op_entry *entry); -#ifdef CONFIG_PERF_EVENTS +#ifdef CONFIG_HW_PERF_EVENTS int __init oprofile_perf_init(struct oprofile_operations *ops); void oprofile_perf_exit(void); char *op_name_from_perf_id(void); -#endif /* CONFIG_PERF_EVENTS */ +#else +static inline int __init oprofile_perf_init(struct oprofile_operations *ops) +{ + pr_info("oprofile: hardware counters not available\n"); + return -ENODEV; +} +static inline void oprofile_perf_exit(void) { } +#endif /* CONFIG_HW_PERF_EVENTS */ #endif /* OPROFILE_H */ |