commit b36e4758dc1b9ff1f6d97e951edba22366230d11
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun Aug 27 12:26:34 2006 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Sep 20 14:58:35 2006 +0100
tree 3419ae3d588bdc1ecc51748c63077cb18ac974c3
parent 7ad1bcb25c5623f1f87c50fdf2272f58ff91db5a

[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 <mingo@elte.hu>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

kernel/fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index f9b014e..8f76adf 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1056,7 +1056,11 @@
 #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_;