[Xen-changelog] [xen master] xen/arm: gic_disable_cpu must be called with interrupts disabled

[patchbot@xxxxxxx]

commit 017610862e55a31a5abb2a7e7da39ad628794e1e
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Tue Apr 16 14:38:27 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri May 10 14:54:07 2013 +0100

    xen/arm: gic_disable_cpu must be called with interrupts disabled
    
    gic_disable_cpu is only called with interrupt disabled.
    Use spin_lock instead of spin_lock_irq and check the function is
    called with interrupts disabled.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/gic.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index dd902d2..1e2d493 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -421,10 +421,12 @@ void __cpuinit gic_init_secondary_cpu(void)
 /* Shut down the per-CPU GIC interface */
 void gic_disable_cpu(void)
 {
-    spin_lock_irq(&gic.lock);
+    ASSERT(!local_irq_is_enabled());
+
+    spin_lock(&gic.lock);
     gic_cpu_disable();
     gic_hyp_disable();
-    spin_unlock_irq(&gic.lock);
+    spin_unlock(&gic.lock);
 }
 
 void gic_route_ppis(void)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog