From 02bc07744099da3fdb33c461ebebeae46ed651e2 Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Mon, 6 Feb 2012 10:59:05 +0100 Subject: [PATCH] --- yaml --- r: 297148 b: refs/heads/master c: 24a13044a84be51a6a4885a72ac9d5f4ed0742d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kvm/sigp.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a847c724f32..6a5e534d3e1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 151104a7b3a82f9c56d636595ae58084049d2559 +refs/heads/master: 24a13044a84be51a6a4885a72ac9d5f4ed0742d0 diff --git a/trunk/arch/s390/kvm/sigp.c b/trunk/arch/s390/kvm/sigp.c index c703b1cbb0aa..f3d5cc297012 100644 --- a/trunk/arch/s390/kvm/sigp.c +++ b/trunk/arch/s390/kvm/sigp.c @@ -160,12 +160,15 @@ static int __inject_sigp_stop(struct kvm_s390_local_interrupt *li, int action) inti->type = KVM_S390_SIGP_STOP; spin_lock_bh(&li->lock); + if ((atomic_read(li->cpuflags) & CPUSTAT_STOPPED)) + goto out; list_add_tail(&inti->list, &li->list); atomic_set(&li->active, 1); atomic_set_mask(CPUSTAT_STOP_INT, li->cpuflags); li->action_bits |= action; if (waitqueue_active(&li->wq)) wake_up_interruptible(&li->wq); +out: spin_unlock_bh(&li->lock); return 0; /* order accepted */