From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 3 Aug 2012 08:54:04 +0000 (+0100)
Subject: arm: fix gic_init_secondary_cpu.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8095
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6163a9386636904b95cd25e354b0c7220d3c72a7;p=xen.git

arm: fix gic_init_secondary_cpu.

Using spin_lock_irq here is unnecessary (interrupts are not yet enabled) and
wrong (since they will get unexpectedly renabled by spin_unlock_irq).

We can just use spin_lock/spin_unlock.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 378158beb4..6f5b0e1b16 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -323,10 +323,10 @@ int __init gic_init(void)
 /* Set up the per-CPU parts of the GIC for a secondary CPU */
 void __cpuinit gic_init_secondary_cpu(void)
 {
-    spin_lock_irq(&gic.lock);
+    spin_lock(&gic.lock);
     gic_cpu_init();
     gic_hyp_init();
-    spin_unlock_irq(&gic.lock);
+    spin_unlock(&gic.lock);
 }
 
 /* Shut down the per-CPU GIC interface */