1 files changed, 24 insertions, 10 deletions

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index f179ac2ea801..b8ef8ddcc292 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -111,14 +111,18 @@ void start_cpu_work(void)
 
 void end_cpu_work(void)
 {
-        int i;
-
         work_enabled = 0;
+}
+
+void flush_cpu_work(void)
+{
+        int i;
 
         for_each_online_cpu(i) {
                 struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i);
 
-                cancel_delayed_work(&b->work);
+                /* these works are per-cpu, no need for flush_sync */
+                flush_delayed_work(&b->work);
         }
 }
 
@@ -254,8 +258,10 @@ op_add_sample(struct oprofile_cpu_buffer *cpu_buf,
  */
 static int
 log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc,
-           unsigned long backtrace, int is_kernel, unsigned long event)
+           unsigned long backtrace, int is_kernel, unsigned long event,
+           struct task_struct *task)
 {
+        struct task_struct *tsk = task ? task : current;
         cpu_buf->sample_received++;
 
         if (pc == ESCAPE_CODE) {
@@ -263,7 +269,7 @@ log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc,
                 return 0;
         }
 
-        if (op_add_code(cpu_buf, backtrace, is_kernel, current))
+        if (op_add_code(cpu_buf, backtrace, is_kernel, tsk))
                 goto fail;
 
         if (op_add_sample(cpu_buf, pc, event))
@@ -288,7 +294,8 @@ static inline void oprofile_end_trace(struct oprofile_cpu_buffer *cpu_buf)
 
 static inline void
 __oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
-                          unsigned long event, int is_kernel)
+                          unsigned long event, int is_kernel,
+                          struct task_struct *task)
 {
         struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
         unsigned long backtrace = oprofile_backtrace_depth;
@@ -297,7 +304,7 @@ __oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
          * if log_sample() fail we can't backtrace since we lost the
          * source of this event
          */
-        if (!log_sample(cpu_buf, pc, backtrace, is_kernel, event))
+        if (!log_sample(cpu_buf, pc, backtrace, is_kernel, event, task))
                 /* failed */
                 return;
 
@@ -309,10 +316,17 @@ __oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
         oprofile_end_trace(cpu_buf);
 }
 
+void oprofile_add_ext_hw_sample(unsigned long pc, struct pt_regs * const regs,
+                                unsigned long event, int is_kernel,
+                                struct task_struct *task)
+{
+        __oprofile_add_ext_sample(pc, regs, event, is_kernel, task);
+}
+
 void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
                              unsigned long event, int is_kernel)
 {
-        __oprofile_add_ext_sample(pc, regs, event, is_kernel);
+        __oprofile_add_ext_sample(pc, regs, event, is_kernel, NULL);
 }
 
 void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
@@ -328,7 +342,7 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
                 pc = ESCAPE_CODE; /* as this causes an early return. */
         }
 
-        __oprofile_add_ext_sample(pc, regs, event, is_kernel);
+        __oprofile_add_ext_sample(pc, regs, event, is_kernel, NULL);
 }
 
 /*
@@ -399,7 +413,7 @@ int oprofile_write_commit(struct op_entry *entry)
 void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)
 {
         struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
-        log_sample(cpu_buf, pc, 0, is_kernel, event);
+        log_sample(cpu_buf, pc, 0, is_kernel, event, NULL);
 }
 
 void oprofile_add_trace(unsigned long pc)