From 31e67c156f3f539b6d64f3ace52439c07cb21341 Mon Sep 17 00:00:00 2001 From: Andrii Anisov Date: Fri, 21 Dec 2018 20:54:16 +0200 Subject: [PATCH] gic-vgic: skip irqs locking in gic_restore_pending_irqs() This function is called under IRQs disabled already, so drop additional flags save and restore. Signed-off-by: Andrii Anisov Reviewed-by: Julien Grall --- xen/arch/arm/gic-vgic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c index a3bba854da..98c021f1a8 100644 --- a/xen/arch/arm/gic-vgic.c +++ b/xen/arch/arm/gic-vgic.c @@ -279,11 +279,12 @@ static void gic_restore_pending_irqs(struct vcpu *v) int lr = 0; struct pending_irq *p, *t, *p_r; struct list_head *inflight_r; - unsigned long flags; unsigned int nr_lrs = gic_get_nr_lrs(); int lrs = nr_lrs; - spin_lock_irqsave(&v->arch.vgic.lock, flags); + ASSERT(!local_irq_is_enabled()); + + spin_lock(&v->arch.vgic.lock); if ( list_empty(&v->arch.vgic.lr_pending) ) goto out; @@ -327,7 +328,7 @@ found: } out: - spin_unlock_irqrestore(&v->arch.vgic.lock, flags); + spin_unlock(&v->arch.vgic.lock); } void gic_clear_pending_irqs(struct vcpu *v) -- 2.30.2