summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAri Kauppi <kauppi@papupata.org>2011-01-20 13:57:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 15:15:08 -0800
commit9784434d04e56b3f37b378bec9b4582dbbb781aa (patch)
tree8ee6f16e110905e395f25276bf93c4d1e0574888
parenta59429bcfb8ef9b44478a37eafa560fe39c3f177 (diff)
oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends
commit 1ea1bdf7faa4d0b5293e605f2e1ef1c2c59f6b53 upstream. The implementations are flagged in Makefile with CONFIG_HW_PERF_EVENTS instead of CONFIG_PERF_EVENTS. Signed-off-by: Ari Kauppi <kauppi@papupata.org> Signed-off-by: Robert Richter <robert.richter@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/linux/oprofile.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 32fb81212fd1..54c83827f913 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 */