Commit-ID: 1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53 Gitweb: http://git.kernel.org/tip/1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53 Author: Ari Kauppi <kauppi@xxxxxxxxxxxx> AuthorDate: Thu, 20 Jan 2011 13:57:18 -0500 Committer: Robert Richter <robert.richter@xxxxxxx> CommitDate: Wed, 26 Jan 2011 19:14:34 +0100 oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends The implementations are flagged in Makefile with CONFIG_HW_PERF_EVENTS instead of CONFIG_PERF_EVENTS. Cc: stable@xxxxxxxxxx # 37.x Signed-off-by: Ari Kauppi <kauppi@xxxxxxxxxxxx> Signed-off-by: Robert Richter <robert.richter@xxxxxxx> --- include/linux/oprofile.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h index 32fb812..54c8382 100644 --- a/include/linux/oprofile.h +++ b/include/linux/oprofile.h @@ -186,10 +186,10 @@ 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 */ +#endif /* CONFIG_HW_PERF_EVENTS */ #endif /* OPROFILE_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|