---

yaml --- r: 377315 b: refs/heads/master c: 8b6fd65 h: refs/heads/master i: 377313: bf5f46c 377311: 9411f6b v: v3
git-mirror · Jun 20, 2013 · 7968382 · 7968382
1 parent d2ae9b6
commit 7968382
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0abb6aeacc20822cd7baee82fd3b61169ca3f32e
+refs/heads/master: 8b6fd652641e5ab1892d092e73e83d49291ed638
diff --git a/trunk/drivers/irqchip/irq-gic.c b/trunk/drivers/irqchip/irq-gic.c
@@ -705,7 +705,7 @@ static int gic_irq_domain_xlate(struct irq_domain *d,
 static int __cpuinit gic_secondary_init(struct notifier_block *nfb,
 					unsigned long action, void *hcpu)
 {
-	if (action == CPU_STARTING)
+	if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)
 		gic_cpu_init(&gic_data[0]);
 	return NOTIFY_OK;
 }