diff --git a/[refs] b/[refs]
index 67b3ee243370..d566a3fb1046 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ad1bcb25c5623f1f87c50fdf2272f58ff91db5a
+refs/heads/master: b36e4758dc1b9ff1f6d97e951edba22366230d11
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index f9b014e3e700..8f76adf1c6a6 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/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_;