public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 7/9] trace: use this_cpu_ptr per-cpu helper
@ 2012-11-02 16:01 Shan Wei
  2012-11-02 17:47 ` Christoph Lameter
  0 siblings, 1 reply; 2+ messages in thread
From: Shan Wei @ 2012-11-02 16:01 UTC (permalink / raw)
  To: rostedt, fweisbec, Kernel-Maillist, mingo, cl, Shan Wei

From: Shan Wei <davidshan@tencent.com>


Signed-off-by: Shan Wei <davidshan@tencent.com>
---
 kernel/trace/blktrace.c |    2 +-
 kernel/trace/trace.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index c0bd030..71259e2 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -147,7 +147,7 @@ void __trace_note_message(struct blk_trace *bt, const char *fmt, ...)
 		return;
 
 	local_irq_save(flags);
-	buf = per_cpu_ptr(bt->msg_data, smp_processor_id());
+	buf = this_cpu_ptr(bt->msg_data);
 	va_start(args, fmt);
 	n = vscnprintf(buf, BLK_TN_MAX_MSG, fmt, args);
 	va_end(args);
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 31e4f55..81ae35b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1513,7 +1513,7 @@ static char *get_trace_buf(void)
 	if (!percpu_buffer)
 		return NULL;
 
-	buffer = per_cpu_ptr(percpu_buffer, smp_processor_id());
+	buffer = this_cpu_ptr(percpu_buffer);
 
 	return buffer->buffer;
 }
-- 1.7.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2 7/9] trace: use this_cpu_ptr per-cpu helper
  2012-11-02 16:01 [PATCH v2 7/9] trace: use this_cpu_ptr per-cpu helper Shan Wei
@ 2012-11-02 17:47 ` Christoph Lameter
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Lameter @ 2012-11-02 17:47 UTC (permalink / raw)
  To: Shan Wei; +Cc: rostedt, fweisbec, Kernel-Maillist, mingo

On Sat, 3 Nov 2012, Shan Wei wrote:

> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 31e4f55..81ae35b 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -1513,7 +1513,7 @@ static char *get_trace_buf(void)
>  	if (!percpu_buffer)
>  		return NULL;
>
> -	buffer = per_cpu_ptr(percpu_buffer, smp_processor_id());
> +	buffer = this_cpu_ptr(percpu_buffer);
>
>  	return buffer->buffer;

	return this_cpu_read(percpu_buffer->buffer)

and drop the this_cpu_ptr operation please.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-02 17:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-02 16:01 [PATCH v2 7/9] trace: use this_cpu_ptr per-cpu helper Shan Wei
2012-11-02 17:47 ` Christoph Lameter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox