Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdffd893 authored by Christoph Lameter's avatar Christoph Lameter Committed by Steven Rostedt
Browse files

tracing: Replace __get_cpu_var uses with this_cpu_ptr 

Replace uses of &__get_cpu_var for address calculation with this_cpu_ptr.

Link: http://lkml.kernel.org/p/alpine.DEB.2.10.1404291415560.18364@gentwo.org



Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 3415c28c

include/linux/kprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static inline void reset_current_kprobe(void) 


static inline struct kprobe_ctlblk *get_kprobe_ctlblk(void)

{

	return (&__get_cpu_var(kprobe_ctlblk));

	return this_cpu_ptr(&kprobe_ctlblk);

}



int register_kprobe(struct kprobe *p);

kernel/trace/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip, 


	local_irq_save(flags);



	stat = &__get_cpu_var(ftrace_profile_stats);

	stat = this_cpu_ptr(&ftrace_profile_stats);

	if (!stat->hash || !ftrace_profile_enabled)

		goto out;
@@ -853,7 +853,7 @@ static void profile_graph_return(struct ftrace_graph_ret *trace) 
	unsigned long flags;



	local_irq_save(flags);

	stat = &__get_cpu_var(ftrace_profile_stats);

	stat = this_cpu_ptr(&ftrace_profile_stats);

	if (!stat->hash || !ftrace_profile_enabled)

		goto out;

kernel/trace/trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer, 
	 */

	barrier();

	if (use_stack == 1) {

		trace.entries		= &__get_cpu_var(ftrace_stack).calls[0];

		trace.entries		= this_cpu_ptr(ftrace_stack.calls);

		trace.max_entries	= FTRACE_STACK_MAX_ENTRIES;



		if (regs)