From 3940e29ec983234034a3387947185d2c22e703a0 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 3 Feb 2012 14:52:14 +0100
Subject: [PATCH] --- yaml --- r: 297590 b: refs/heads/master c:
 e0b823e9a543527dbb0f806252ee03a60f2aefbc h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/arm/common/gic.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9514b5a60065..57199e7920f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 342d00ae2b85af003f11036484a33e12e906fe92
+refs/heads/master: e0b823e9a543527dbb0f806252ee03a60f2aefbc
diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c
index b2dc2dd7f1df..a3bc86fa3156 100644
--- a/trunk/arch/arm/common/gic.c
+++ b/trunk/arch/arm/common/gic.c
@@ -697,13 +697,12 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
 	 * For primary GICs, skip over SGIs.
 	 * For secondary GICs, skip over PPIs, too.
 	 */
-	domain->hwirq_base = 32;
-	if (gic_nr == 0) {
-		if ((irq_start & 31) > 0) {
-			domain->hwirq_base = 16;
-			if (irq_start != -1)
-				irq_start = (irq_start & ~31) + 16;
-		}
+	if (gic_nr == 0 && (irq_start & 31) > 0) {
+		domain->hwirq_base = 16;
+		if (irq_start != -1)
+			irq_start = (irq_start & ~31) + 16;
+	} else {
+		domain->hwirq_base = 32;
 	}
 
 	/*