Re: [2.6.26-rc5-git2] WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()

[Ingo Molnar <mingo@elte.hu>]

* Peter Zijlstra <a.p.zijlstra@chello.nl> wrote:

> On Thu, 2008-06-12 at 08:55 +0200, Vegard Nossum wrote:
> 
> 
> > From: Vegard Nossum <vegard.nossum@gmail.com>
> > Date: Thu, 12 Jun 2008 08:49:18 +0200
> > Subject: [PATCH] x86: more hardirq annotations for notify_die()
> > 
> > Reported-by: Alessandro Suardi <alessandro.suardi@gmail.com>
> > Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
> > ---
> >  arch/x86/kernel/traps_32.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
> > index bde6f63..be9ecae 100644
> > --- a/arch/x86/kernel/traps_32.c
> > +++ b/arch/x86/kernel/traps_32.c
> > @@ -569,6 +569,7 @@ void do_##name(struct pt_regs *regs, long error_code)			\
> >  #define DO_VM86_ERROR(trapnr, signr, str, name)				\
> >  void do_##name(struct pt_regs *regs, long error_code)			\
> >  {									\
> > +	trace_hardirqs_fixup();						\
> >  	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\
> >  						== NOTIFY_STOP)		\
> >  		return;							\
> 
> Yeah, I think this is ok, actual traps don't have any way of knowing the
> actual IRQ state afaik. So
> 
> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>

applied to tip/x86/urgent - thanks.

Alessandro, does the patch from Vegard fix the ltrace warning for you?

	Ingo