From 9369f62b4e25e11c08bbcf6a91a6ff0f6e8d71ab Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 16 Dec 2008 12:00:10 +0100 Subject: [PATCH] --- yaml --- r: 128201 b: refs/heads/master c: d45d23bed4bf7b25b7dcc336552a251db1aa1279 h: refs/heads/master i: 128199: 4bf0c1e6a1172ec6575cc3dbefcfc51b50929eb0 v: v3 --- [refs] | 2 +- trunk/drivers/oprofile/cpu_buffer.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fdfb53a8725f..db5d8ee520f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 300157768f050dabc73a99d958b504282088a132 +refs/heads/master: d45d23bed4bf7b25b7dcc336552a251db1aa1279 diff --git a/trunk/drivers/oprofile/cpu_buffer.c b/trunk/drivers/oprofile/cpu_buffer.c index b353b19bd786..9e66c384e016 100644 --- a/trunk/drivers/oprofile/cpu_buffer.c +++ b/trunk/drivers/oprofile/cpu_buffer.c @@ -277,8 +277,9 @@ static void oprofile_end_trace(struct oprofile_cpu_buffer *cpu_buf) cpu_buf->tracing = 0; } -void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs, - unsigned long event, int is_kernel) +static inline void +__oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs, + unsigned long event, int is_kernel) { struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer); @@ -299,12 +300,18 @@ void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs, oprofile_end_trace(cpu_buf); } +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); +} + void oprofile_add_sample(struct pt_regs * const regs, unsigned long event) { int is_kernel = !user_mode(regs); unsigned long pc = profile_pc(regs); - oprofile_add_ext_sample(pc, regs, event, is_kernel); + __oprofile_add_ext_sample(pc, regs, event, is_kernel); } #ifdef CONFIG_OPROFILE_IBS