Commit-ID: 9ca79f1559dc54268bdf129c0b2a1e2bcebeb0d5 Gitweb: http://git.kernel.org/tip/9ca79f1559dc54268bdf129c0b2a1e2bcebeb0d5 Author: Ming Lei <tom.leiming@xxxxxxxxx> AuthorDate: Wed, 5 May 2010 00:01:12 +0800 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Tue, 4 May 2010 18:33:20 +0200 lockdep, fork: Fix dependency of hardirqs_enabled and softirqs_enabled The defination of hardirqs_enabled and softirqs_enabled in task_struct depends on CONFIG_TRACE_IRQFLAGS instead of CONFIG_PROVE_LOCKING. Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx> Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx> LKML-Reference: <1272988872-2347-1-git-send-email-tom.leiming@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/fork.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index 44b0791..038a8fd 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1004,7 +1004,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, rt_mutex_init_task(p); -#ifdef CONFIG_PROVE_LOCKING +#ifdef CONFIG_TRACE_IRQFLAGS DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|