drivers/oprofile: Replace __get_cpu_var uses for address calculation

Christoph Lameter · htejun · commit 879d92745a1a · 2014-08-26T13:45:46.000-04:00
Replace the uses of __get_cpu_var for address calculation with this_cpu_ptr.

Cc: Robert Richter &lt;rric@kernel.org&gt;
Cc: oprofile-list@lists.sf.net
Signed-off-by: Christoph Lameter &lt;cl@linux.com&gt;
Signed-off-by: Tejun Heo &lt;tj@kernel.org&gt;
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
@@ -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;
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ unsigned long oprofile_get_cpu_buffer_size(void)`
`45`	`45`
`46`	`46`	`void oprofile_cpu_buffer_inc_smpl_lost(void)`
`47`	`47`	`{`
`48`		`- struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);`
	`48`	`+ struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);`
`49`	`49`
`50`	`50`	`cpu_buf->sample_lost_overflow++;`
`51`	`51`	`}`
`@@ -297,7 +297,7 @@ __oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,`
`297`	`297`	`unsigned long event, int is_kernel,`
`298`	`298`	`struct task_struct *task)`
`299`	`299`	`{`
`300`		`- struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);`
	`300`	`+ struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);`
`301`	`301`	`unsigned long backtrace = oprofile_backtrace_depth;`
`302`	`302`
`303`	`303`	`/*`
`@@ -357,7 +357,7 @@ oprofile_write_reserve(struct op_entry entry, struct pt_regs const regs,`
`357`	`357`	`{`
`358`	`358`	`struct op_sample *sample;`
`359`	`359`	`int is_kernel = !user_mode(regs);`
`360`		`- struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);`
	`360`	`+ struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);`
`361`	`361`
`362`	`362`	`cpu_buf->sample_received++;`
`363`	`363`
`@@ -412,13 +412,13 @@ int oprofile_write_commit(struct op_entry *entry)`
`412`	`412`
`413`	`413`	`void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)`
`414`	`414`	`{`
`415`		`- struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);`
	`415`	`+ struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);`
`416`	`416`	`log_sample(cpu_buf, pc, 0, is_kernel, event, NULL);`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`void oprofile_add_trace(unsigned long pc)`
`420`	`420`	`{`
`421`		`- struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);`
	`421`	`+ struct oprofile_cpu_buffer *cpu_buf = this_cpu_ptr(&op_cpu_buffer);`
`422`	`422`
`423`	`423`	`if (!cpu_buf->tracing)`
`424`	`424`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ static enum hrtimer_restart oprofile_hrtimer_notify(struct hrtimer *hrtimer)`
`32`	`32`
`33`	`33`	`static void __oprofile_hrtimer_start(void *unused)`
`34`	`34`	`{`
`35`		`- struct hrtimer *hrtimer = &__get_cpu_var(oprofile_hrtimer);`
	`35`	`+ struct hrtimer *hrtimer = this_cpu_ptr(&oprofile_hrtimer);`
`36`	`36`
`37`	`37`	`if (!ctr_running)`
`38`	`38`	`return;`