Re: [PATCH][RESEND] tracing: Fix lockdep warning in global_clock()

[Peter Zijlstra <peterz@infradead.org>]

On Wed, 2010-03-24 at 10:57 +0800, Li Zefan wrote:
> # echo 1 > events/enable
>  # echo global > trace_clock
> 
> ------------[ cut here ]------------
> WARNING: at kernel/lockdep.c:3162 check_flags+0xb2/0x190()
> ...
> ---[ end trace 3f86734a89416623 ]---
> possible reason: unannotated irqs-on.
> ...
> 
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>

> ---
>  kernel/trace/trace_clock.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
> index 6fbfb8f..9d589d8 100644
> --- a/kernel/trace/trace_clock.c
> +++ b/kernel/trace/trace_clock.c
> @@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)
>  	int this_cpu;
>  	u64 now;
>  
> -	raw_local_irq_save(flags);
> +	local_irq_save(flags);
>  
>  	this_cpu = raw_smp_processor_id();
>  	now = cpu_clock(this_cpu);
> @@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void)
>  	arch_spin_unlock(&trace_clock_struct.lock);
>  
>   out:
> -	raw_local_irq_restore(flags);
> +	local_irq_restore(flags);
>  
>  	return now;
>  }