From: Russell King Date: Sun, 27 Aug 2006 11:26:34 +0000 (+0100) Subject: [ARM] Fix kernel/fork.c for lockdep on ARM X-Git-Tag: v2.6.19-rc1~885^2~78 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b36e4758dc1b9ff1f6d97e951edba22366230d11;p=linux-2.6-omap-h63xx.git [ARM] Fix kernel/fork.c for lockdep on ARM ARM has interrupts enabled over context switches (iow, has __ARCH_WANT_INTERRUPTS_ON_CTXSW defined.) The lockdep code in fork.c assumes that interrupts are always disabled. Fix this wrong assumption by making the initialisation of 'p->hardirqs_enabled' depend on __ARCH_WANT_INTERRUPTS_ON_CTXSW. Acked-by: Ingo Molnar Signed-off-by: Russell King --- diff --git a/kernel/fork.c b/kernel/fork.c index f9b014e3e70..8f76adf1c6a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1056,7 +1056,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, #endif #ifdef CONFIG_TRACE_IRQFLAGS p->irq_events = 0; +#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW + p->hardirqs_enabled = 1; +#else p->hardirqs_enabled = 0; +#endif p->hardirq_enable_ip = 0; p->hardirq_enable_event = 0; p->hardirq_disable_ip = _THIS_IP_;