diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 14:55:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 14:55:13 -0700 |
| commit | 40e7babbb52b4b57721b9175aed7a14d93bf242f (patch) | |
| tree | e16bc0a698c891922ca4c0166e0e08ac194718ed /kernel/fork.c | |
| parent | 948769a5ba304ed3329a2f42ee3561f04a0b5692 (diff) | |
| parent | d12c1a37925a8ec386994169605fe99217295199 (diff) | |
Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: fix kernel/fork.c warning
lockdep: fix ftrace irq tracing false positive
lockdep: remove duplicate definition of STATIC_LOCKDEP_MAP_INIT
lockdep: add lock_class information to lock_chain and output it
lockdep: add lock_class information to lock_chain and output it
lockdep: output lock_class key instead of address for forward dependency output
__mutex_lock_common: use signal_pending_state()
mutex-debug: check mutex magic before owner
Fixed up conflict in kernel/fork.c manually
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 16fd412c756d..4bd2f516401f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -910,7 +910,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, rt_mutex_init_task(p); -#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_LOCKDEP) +#ifdef CONFIG_PROVE_LOCKING DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif |