diff options
Diffstat (limited to 'drivers/oprofile')
-rw-r--r-- | drivers/oprofile/cpu_buffer.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index 330d3869b41e..fc4bc9b94c74 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
@@ -217,11 +217,10 @@ static void oprofile_end_trace(struct oprofile_cpu_buffer * cpu_buf) | |||
217 | cpu_buf->tracing = 0; | 217 | cpu_buf->tracing = 0; |
218 | } | 218 | } |
219 | 219 | ||
220 | void oprofile_add_sample(struct pt_regs * const regs, unsigned long event) | 220 | void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs, |
221 | unsigned long event, int is_kernel) | ||
221 | { | 222 | { |
222 | struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()]; | 223 | struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()]; |
223 | unsigned long pc = profile_pc(regs); | ||
224 | int is_kernel = !user_mode(regs); | ||
225 | 224 | ||
226 | if (!backtrace_depth) { | 225 | if (!backtrace_depth) { |
227 | log_sample(cpu_buf, pc, is_kernel, event); | 226 | log_sample(cpu_buf, pc, is_kernel, event); |
@@ -238,6 +237,14 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event) | |||
238 | oprofile_end_trace(cpu_buf); | 237 | oprofile_end_trace(cpu_buf); |
239 | } | 238 | } |
240 | 239 | ||
240 | void oprofile_add_sample(struct pt_regs * const regs, unsigned long event) | ||
241 | { | ||
242 | int is_kernel = !user_mode(regs); | ||
243 | unsigned long pc = profile_pc(regs); | ||
244 | |||
245 | oprofile_add_ext_sample(pc, regs, event, is_kernel); | ||
246 | } | ||
247 | |||
241 | void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event) | 248 | void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event) |
242 | { | 249 | { |
243 | struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()]; | 250 | struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()]; |