From patchwork Wed Apr 7 10:28:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 49587 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E3512B7D19 for ; Wed, 7 Apr 2010 20:28:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757852Ab0DGK2a (ORCPT ); Wed, 7 Apr 2010 06:28:30 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:52334 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757742Ab0DGK23 (ORCPT ); Wed, 7 Apr 2010 06:28:29 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 65C8D24C090; Wed, 7 Apr 2010 03:28:32 -0700 (PDT) Date: Wed, 07 Apr 2010 03:28:32 -0700 (PDT) Message-Id: <20100407.032832.150975074.davem@davemloft.net> To: a.p.zijlstra@chello.nl Cc: mingo@elte.hu, acme@redhat.com, paulus@samba.org, efault@gmx.de, fweisbec@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org Subject: Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers. From: David Miller In-Reply-To: <20100406.164002.40105966.davem@davemloft.net> References: <20100406.164002.40105966.davem@davemloft.net> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: David Miller Date: Tue, 06 Apr 2010 16:40:02 -0700 (PDT) > > Signed-off-by: David S. Miller Peter, I found one more file that needs this annotation while implementing function graph tracing support on sparc64. Please add this to the original patch when you queue it up, thanks. --- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index e6989d9..67fbdf1 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -220,7 +220,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) if (!(trace->depth || ftrace_graph_addr(trace->func))) return 0; - local_irq_save(flags); + local_irq_save_nmi(flags); cpu = raw_smp_processor_id(); data = tr->data[cpu]; disabled = atomic_inc_return(&data->disabled); @@ -232,7 +232,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) } atomic_dec(&data->disabled); - local_irq_restore(flags); + local_irq_restore_nmi(flags); return ret; } @@ -277,7 +277,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace) int cpu; int pc; - local_irq_save(flags); + local_irq_save_nmi(flags); cpu = raw_smp_processor_id(); data = tr->data[cpu]; disabled = atomic_inc_return(&data->disabled); @@ -286,7 +286,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace) __trace_graph_return(tr, trace, flags, pc); } atomic_dec(&data->disabled); - local_irq_restore(flags); + local_irq_restore_nmi(flags); } void set_graph_array(struct trace_array *tr)