From: David Miller <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.
Date: Wed, 07 Apr 2010 03:28:32 -0700 (PDT) [thread overview]
Message-ID: <20100407.032832.150975074.davem@davemloft.net> (raw)
In-Reply-To: <20100406.164002.40105966.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Tue, 06 Apr 2010 16:40:02 -0700 (PDT)
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
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.
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)
prev parent reply other threads:[~2010-04-07 10:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-06 23:40 [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers David Miller
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:17 ` David Miller
2010-04-07 1:17 ` David Miller
2010-04-07 10:28 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100407.032832.150975074.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=efault@gmx.de \
--cc=fweisbec@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).