[GIT PULL] lockdep updates

[GIT PULL] lockdep updates

[Peter Zijlstra]

Linus, please pull a few lockdep patches from:

  git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git v2.6.24-rc7-lockdep

These patches have had a fair amount of testing.

---
Johannes Berg (1):
      lockdep: fix workqueue creation API lockdep interaction

Nick Piggin (1):
      lockdep: fix internal double unlock during self-test

Peter Zijlstra (1):
      lockdep: more hardirq annotations for notify_die()

 arch/x86/kernel/traps_32.c |    1 +
 arch/x86/kernel/traps_64.c |    1 +
 include/linux/workqueue.h  |   14 +++++++++++---
 kernel/lockdep.c           |   12 ++++++++----
 kernel/workqueue.c         |    5 +++--
 5 files changed, 24 insertions(+), 9 deletions(-)

[GIT PULL] lockdep updates

[Peter Zijlstra]

Linus, please pull a few lockdep patches from:

  git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git v2.6.25-rc3-lockdep

---
Dale Farnsworth (1):
      Subject: lockdep: include all lock classes in all_lock_classes

Peter Zijlstra (1):
      lockdep: increase MAX_LOCK_DEPTH

 include/linux/sched.h |    2 +-
 kernel/lockdep.c      |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

[GIT PULL] lockdep updates

[Frederic Weisbecker]

Ingo,

Please pull the core/locking branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
	core/locking

Note there is also a merge of v2.6.34-rc6 because these patches
depend on older per cpu updates.

Thanks,
	Frederic
---

Frederic Weisbecker (2):
      lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
      lockdep: Simplify debug atomic ops


 kernel/lockdep.c           |    7 ++++++-
 kernel/lockdep_internals.h |   10 ++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

Re: [GIT PULL] lockdep updates

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@gmail.com> wrote:

> Ingo,
> 
> Please pull the core/locking branch that can be found at:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> 	core/locking
> 
> Note there is also a merge of v2.6.34-rc6 because these patches
> depend on older per cpu updates.
> 
> Thanks,
> 	Frederic
> ---
> 
> Frederic Weisbecker (2):
>       lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
>       lockdep: Simplify debug atomic ops
> 
> 
>  kernel/lockdep.c           |    7 ++++++-
>  kernel/lockdep_internals.h |   10 ++--------
>  2 files changed, 8 insertions(+), 9 deletions(-)

Pulled, thanks Frederic!

	Ingo

Re: [GIT PULL] lockdep updates

[Ingo Molnar]

* Ingo Molnar <mingo@elte.hu> wrote:

> 
> * Frederic Weisbecker <fweisbec@gmail.com> wrote:
> 
> > Ingo,
> > 
> > Please pull the core/locking branch that can be found at:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> > 	core/locking
> > 
> > Note there is also a merge of v2.6.34-rc6 because these patches
> > depend on older per cpu updates.
> > 
> > Thanks,
> > 	Frederic
> > ---
> > 
> > Frederic Weisbecker (2):
> >       lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
> >       lockdep: Simplify debug atomic ops
> > 
> > 
> >  kernel/lockdep.c           |    7 ++++++-
> >  kernel/lockdep_internals.h |   10 ++--------
> >  2 files changed, 8 insertions(+), 9 deletions(-)

this one is causing:

kernel/lockdep.c:2306: error: 'lockdep_stats' undeclared (first use in this function)
kernel/lockdep.c:2306: error: (Each undeclared identifier is reported only once
kernel/lockdep.c:2306: error: for each function it appears in.)

with these settings:

CONFIG_LOCKDEP=y
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_LOCKDEP is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

Thanks,

	Ingo

Re: [GIT PULL] lockdep updates

[Frederic Weisbecker]

On Mon, May 03, 2010 at 03:00:35PM +0200, Ingo Molnar wrote:
> 
> * Ingo Molnar <mingo@elte.hu> wrote:
> 
> > 
> > * Frederic Weisbecker <fweisbec@gmail.com> wrote:
> > 
> > > Ingo,
> > > 
> > > Please pull the core/locking branch that can be found at:
> > > 
> > > git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> > > 	core/locking
> > > 
> > > Note there is also a merge of v2.6.34-rc6 because these patches
> > > depend on older per cpu updates.
> > > 
> > > Thanks,
> > > 	Frederic
> > > ---
> > > 
> > > Frederic Weisbecker (2):
> > >       lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
> > >       lockdep: Simplify debug atomic ops
> > > 
> > > 
> > >  kernel/lockdep.c           |    7 ++++++-
> > >  kernel/lockdep_internals.h |   10 ++--------
> > >  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> this one is causing:
> 
> kernel/lockdep.c:2306: error: 'lockdep_stats' undeclared (first use in this function)
> kernel/lockdep.c:2306: error: (Each undeclared identifier is reported only once
> kernel/lockdep.c:2306: error: for each function it appears in.)
> 
> with these settings:
> 
> CONFIG_LOCKDEP=y
> # CONFIG_LOCK_STAT is not set
> # CONFIG_DEBUG_LOCKDEP is not set
> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
> # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
> 
> Thanks,
> 
> 	Ingo


Ah, I unconditionally deref lockdep_stats there. Ok, will
fix.

I'm not home yet, but once I can, will send the fix asap.

Thanks.