---

yaml --- r: 276156 b: refs/heads/master c: abdd7b9 h: refs/heads/master v: v3
git-mirror · Nov 26, 2011 · 77ce826 · 77ce826
1 parent e6b8b05
commit 77ce826
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97371fa99c1900a84a5220639edd726b35d73931
+refs/heads/master: abdd7b91dab2f8b2e32e90e4b7e809ffb462a662
diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c
@@ -526,7 +526,8 @@ static void __init gic_pm_init(struct gic_chip_data *gic)
 		sizeof(u32));
 	BUG_ON(!gic->saved_ppi_conf);
 
-	cpu_pm_register_notifier(&gic_notifier_block);
+	if (gic == &gic_data[0])
+		cpu_pm_register_notifier(&gic_notifier_block);
 }
 #else
 static void __init gic_pm_init(struct gic_chip_data *gic)