Commit b36e4758 authored by Russell King's avatar Russell King Committed by Russell King

[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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7ad1bcb2
...@@ -1056,7 +1056,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, ...@@ -1056,7 +1056,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
#endif #endif
#ifdef CONFIG_TRACE_IRQFLAGS #ifdef CONFIG_TRACE_IRQFLAGS
p->irq_events = 0; p->irq_events = 0;
#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
p->hardirqs_enabled = 1;
#else
p->hardirqs_enabled = 0; p->hardirqs_enabled = 0;
#endif
p->hardirq_enable_ip = 0; p->hardirq_enable_ip = 0;
p->hardirq_enable_event = 0; p->hardirq_enable_event = 0;
p->hardirq_disable_ip = _THIS_IP_; p->hardirq_disable_ip = _THIS_IP_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment