From: Steven J. Hill <sjhill@mips.com>
Date: Fri, 31 Aug 2012 21:23:49 +0000 (-0500)
Subject: MIPS: Make VPE count to be one-based.
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13900^2~5^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3234f4466934f08136736790e3de3c6debc71271;p=mirror_ubuntu-artful-kernel.git

MIPS: Make VPE count to be one-based.

When dealing with multiple VPEs, the count needs to be one-based
for correct initialization of the GIC.

Signed-off-by: Steven J. Hill <sjhill@mips.com>
---

diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c
index c2bec301e7ad..485e6a961b31 100644
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
@@ -312,6 +312,7 @@ void __init gic_init(unsigned long gic_base_addr,
 
 	numvpes = (gicconfig & GIC_SH_CONFIG_NUMVPES_MSK) >>
 		  GIC_SH_CONFIG_NUMVPES_SHF;
+	numvpes = numvpes + 1;
 
 	gic_basic_init(numintrs, numvpes, intr_map, intr_map_size);