From 77ce82618257fb656d5bbee157b76b1972f52b95 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 25 Nov 2011 17:58:19 +0100 Subject: [PATCH] --- yaml --- r: 276156 b: refs/heads/master c: abdd7b91dab2f8b2e32e90e4b7e809ffb462a662 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/common/gic.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4b31def47605..e7e9263d69bf 100644 --- 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 index 0e6ae470c94f..43240f315dea 100644 --- 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)