From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 06 Apr 2010 21:14:10 -0400

quoted text
> On Tue, 2010-04-06 at 16:40 -0700, David Miller wrote:
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> ---
>>  kernel/trace/ftrace.c             |    4 ++--
>>  kernel/trace/trace_functions.c    |    8 ++++----
>>  kernel/trace/trace_sched_wakeup.c |    4 ++--
>>  kernel/trace/trace_stack.c        |    4 ++--
>>  4 files changed, 10 insertions(+), 10 deletions(-)
>> 
>> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
>> index d9062f5..41d4282 100644
>> --- a/kernel/trace/ftrace.c
>> +++ b/kernel/trace/ftrace.c
>> @@ -612,7 +612,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
>>  	if (!ftrace_profile_enabled)
>>  		return;
>>  
>> -	local_irq_save(flags);
>> +	local_irq_save_nmi(flags);
> 
> These are equivalent for non sparc archs, correct?

Yes.

quoted text
> If so,
> 
> Acked-by: Steven Rostedt <rostedt@goodmis.org>
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/