oprofile: remove backtrace code for ibs

This code is broken since a TRACE_BEGIN_CODE is never sent to the
daemon. The data becomes corrupt since the backtrace is interpreted as
ibs sample.

Signed-off-by: Robert Richter <robert.richter@amd.com>

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 7415d2e6b3a15953b4f446f9467b5b8599452b97..e61e25fda1ad9b0039f441dfe01c02a4326db958 100644 (file)
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -557,11 +557,9 @@ void sync_buffer(int cpu)
                                break;
 #ifdef CONFIG_OPROFILE_IBS
                        case IBS_FETCH_BEGIN:
-                               state = sb_bt_start;
                                add_ibs_begin(cpu, IBS_FETCH_CODE, mm);
                                break;
                        case IBS_OP_BEGIN:
-                               state = sb_bt_start;
                                add_ibs_begin(cpu, IBS_OP_CODE, mm);
                                break;
 #endif

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 8ae37c9d0ec4c041628d5fa2db2bbcc3dbde0ac5..92bf8c0d86feb64d75653399878897de8efa6e57 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -347,17 +347,11 @@ void oprofile_add_ibs_sample(struct pt_regs * const regs,
                fail = fail || add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]);
        }
 
-       if (fail)
-               goto fail;
-
-       if (oprofile_backtrace_depth)
-               oprofile_ops.backtrace(regs, oprofile_backtrace_depth);
-
-       return;
+       if (!fail)
+               return;
 
 fail:
        cpu_buf->sample_lost_overflow++;
-       return;
 }
 
 #endif