drivers/oprofile: Replace __get_cpu_var uses for address calculation
Replace the uses of __get_cpu_var for address calculation with this_cpu_ptr. Cc: Robert Richter <rric@kernel.org> Cc: oprofile-list@lists.sf.net Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
229b6863b2
commit
879d92745a
|
@ -45,7 +45,7 @@ unsigned long oprofile_get_cpu_buffer_size(void)
|
|||
|
||||
void oprofile_cpu_buffer_inc_smpl_lost(void)
|
||||
{
|
||||
struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
|
||||
struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);
|
||||
|
||||
cpu_buf->sample_lost_overflow++;
|
||||
}
|
||||
|
@ -297,7 +297,7 @@ __oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
|
|||
unsigned long event, int is_kernel,
|
||||
struct task_struct *task)
|
||||
{
|
||||
struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
|
||||
struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);
|
||||
unsigned long backtrace = oprofile_backtrace_depth;
|
||||
|
||||
/*
|
||||
|
@ -357,7 +357,7 @@ oprofile_write_reserve(struct op_entry *entry, struct pt_regs * const regs,
|
|||
{
|
||||
struct op_sample *sample;
|
||||
int is_kernel = !user_mode(regs);
|
||||
struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
|
||||
struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);
|
||||
|
||||
cpu_buf->sample_received++;
|
||||
|
||||
|
@ -412,13 +412,13 @@ 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);
|
||||
struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);
|
||||
log_sample(cpu_buf, pc, 0, is_kernel, event, NULL);
|
||||
}
|
||||
|
||||
void oprofile_add_trace(unsigned long pc)
|
||||
{
|
||||
struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
|
||||
struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);
|
||||
|
||||
if (!cpu_buf->tracing)
|
||||
return;
|
||||
|
|
|
@ -32,7 +32,7 @@ static enum hrtimer_restart oprofile_hrtimer_notify(struct hrtimer *hrtimer)
|
|||
|
||||
static void __oprofile_hrtimer_start(void *unused)
|
||||
{
|
||||
struct hrtimer *hrtimer = &__get_cpu_var(oprofile_hrtimer);
|
||||
struct hrtimer *hrtimer = this_cpu_ptr(&oprofile_hrtimer);
|
||||
|
||||
if (!ctr_running)
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue