1 files changed, 15 insertions, 33 deletions

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index e1bd5a937f6c..d6c68270b3da 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -257,21 +257,23 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
 
 #ifdef CONFIG_OPROFILE_IBS
 
-#define MAX_IBS_SAMPLE_SIZE     14
-static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
-        unsigned long pc, int is_kernel, unsigned  int *ibs, int ibs_code)
+#define MAX_IBS_SAMPLE_SIZE 14
+
+void oprofile_add_ibs_sample(struct pt_regs *const regs,
+                             unsigned int * const ibs_sample, int ibs_code)
 {
+        int is_kernel = !user_mode(regs);
+        struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
         struct task_struct *task;
 
         cpu_buf->sample_received++;
 
         if (nr_available_slots(cpu_buf) < MAX_IBS_SAMPLE_SIZE) {
+                /* we can't backtrace since we lost the source of this event */
                 cpu_buf->sample_lost_overflow++;
-                return 0;
+                return;
         }
 
-        is_kernel = !!is_kernel;
-
         /* notice a switch from user->kernel or vice versa */
         if (cpu_buf->last_is_kernel != is_kernel) {
                 cpu_buf->last_is_kernel = is_kernel;
@@ -281,7 +283,6 @@ static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
         /* notice a task switch */
         if (!is_kernel) {
                 task = current;
-
                 if (cpu_buf->last_task != task) {
                         cpu_buf->last_task = task;
                         add_code(cpu_buf, (unsigned long)task);
@@ -289,36 +290,17 @@ static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
         }
 
         add_code(cpu_buf, ibs_code);
-        add_sample(cpu_buf, ibs[0], ibs[1]);
-        add_sample(cpu_buf, ibs[2], ibs[3]);
-        add_sample(cpu_buf, ibs[4], ibs[5]);
+        add_sample(cpu_buf, ibs_sample[0], ibs_sample[1]);
+        add_sample(cpu_buf, ibs_sample[2], ibs_sample[3]);
+        add_sample(cpu_buf, ibs_sample[4], ibs_sample[5]);
 
         if (ibs_code == IBS_OP_BEGIN) {
-        add_sample(cpu_buf, ibs[6], ibs[7]);
-        add_sample(cpu_buf, ibs[8], ibs[9]);
-        add_sample(cpu_buf, ibs[10], ibs[11]);
-        }
-
-        return 1;
-}
-
-void oprofile_add_ibs_sample(struct pt_regs *const regs,
-                                unsigned int * const ibs_sample, u8 code)
-{
-        int is_kernel = !user_mode(regs);
-        unsigned long pc = profile_pc(regs);
-
-        struct oprofile_cpu_buffer *cpu_buf =
-                         &per_cpu(cpu_buffer, smp_processor_id());
-
-        if (!backtrace_depth) {
-                log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code);
-                return;
+                add_sample(cpu_buf, ibs_sample[6], ibs_sample[7]);
+                add_sample(cpu_buf, ibs_sample[8], ibs_sample[9]);
+                add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]);
         }
 
-        /* if log_sample() fails we can't backtrace since we lost the source
-        * of this event */
-        if (log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code))
+        if (backtrace_depth)
                 oprofile_ops.backtrace(regs, backtrace_depth);
 }