x86/oprofile: add CONFIG_OPROFILE_IBS option

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index e1782d2df09f..ed982273fb8b 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -328,6 +328,8 @@ static void add_trace_begin(void)
         add_event_entry(TRACE_BEGIN_CODE);
 }
 
+#ifdef CONFIG_OPROFILE_IBS
+
 #define IBS_FETCH_CODE_SIZE     2
 #define IBS_OP_CODE_SIZE        5
 #define IBS_EIP(offset)                         \
@@ -390,6 +392,8 @@ static void add_ibs_begin(struct oprofile_cpu_buffer *cpu_buf, int code,
         }
 }
 
+#endif
+
 static void add_sample_entry(unsigned long offset, unsigned long event)
 {
         add_event_entry(offset);
@@ -586,6 +590,7 @@ void sync_buffer(int cpu)
                         } else if (s->event == CPU_TRACE_BEGIN) {
                                 state = sb_bt_start;
                                 add_trace_begin();
+#ifdef CONFIG_OPROFILE_IBS
                         } else if (s->event == IBS_FETCH_BEGIN) {
                                 state = sb_bt_start;
                                 add_ibs_begin(cpu_buf,
@@ -594,6 +599,7 @@ void sync_buffer(int cpu)
                                 state = sb_bt_start;
                                 add_ibs_begin(cpu_buf,
                                         IBS_OP_CODE, in_kernel, mm);
+#endif
                         } else {
                                 struct mm_struct *oldmm = mm;