From patchwork Thu Apr 30 12:12:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47836 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 907D82121F for ; Thu, 30 Apr 2015 12:29:41 +0000 (UTC) Received: by lbcne10 with SMTP id ne10sf14094621lbc.1 for ; Thu, 30 Apr 2015 05:29:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=FAwWLxq4NszXqEZQIhKvj1Nw7xnYoovbxpOwm9ad+Zo=; b=bb1cXX4NPvLf5j3benghsBHVsIL8DBWoe4SvQIgzUCQCdw7L9JhbXHUuZXO2+NeaaR UiZkqykVukesvb9S9G+LyKKyCPljUYupmHyJJAal7AE5qRnPLxBi33y4mEIb7nYnDG1t L0gi4yujYlby36Nq8cxmiqBSM48QIxahV6G8Kl+jdhnayC7nVX6CnUvX1qlrJjX+kWMx 8Nwv2iGoUb3LCP+NfozYVHVelkq1ObHHd08VwE2rfBmGOJs0s63d/b9E06mt8K2UDcGR hfgq2hcdJVy1VWEsIODYCnuNDDc8IeT0qhpQxYVcf5u0l4sxfj6zvPW47hUgfEzEEDZn b4Pw== X-Gm-Message-State: ALoCoQk2PJwKilqE5GGVnmP20QK/UkqLyGQw+duYVN7b3ccz56K2bBzoHw4xXDj9iUi5p0cAt8yE X-Received: by 10.180.7.138 with SMTP id j10mr1624359wia.2.1430396980562; Thu, 30 Apr 2015 05:29:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.229 with SMTP id w5ls88116lag.44.gmail; Thu, 30 Apr 2015 05:29:40 -0700 (PDT) X-Received: by 10.112.168.102 with SMTP id zv6mr3611942lbb.45.1430396980404; Thu, 30 Apr 2015 05:29:40 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id h1si1629178lam.172.2015.04.30.05.29.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 05:29:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labbd9 with SMTP id bd9so42920166lab.2 for ; Thu, 30 Apr 2015 05:29:40 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr3537798lbc.41.1430396980117; Thu, 30 Apr 2015 05:29:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp3083497lbt; Thu, 30 Apr 2015 05:29:39 -0700 (PDT) X-Received: by 10.67.24.65 with SMTP id ig1mr7673346pad.61.1430396348140; Thu, 30 Apr 2015 05:19:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bz7si3324227pdb.16.2015.04.30.05.19.06; Thu, 30 Apr 2015 05:19:08 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752136AbbD3MRu (ORCPT + 28 others); Thu, 30 Apr 2015 08:17:50 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:53677 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751454AbbD3MMf (ORCPT ); Thu, 30 Apr 2015 08:12:35 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnnKT-0008De-E0; Thu, 30 Apr 2015 14:12:33 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Christoffer Dall , Shannon Zhao , Jiri Slaby Subject: [PATCH 3.12 54/63] arm/arm64: KVM: Don't clear the VCPU_POWER_OFF flag Date: Thu, 30 Apr 2015 14:12:23 +0200 Message-Id: <9177e8d7ad081480234c6ff59d98f941413a6b2c.1430387326.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> References: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Christoffer Dall 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 03f1d4c17edb31b41b14ca3a749ae38d2dd6639d upstream. If a VCPU was originally started with power off (typically to be brought up by PSCI in SMP configurations), there is no need to clear the POWER_OFF flag in the kernel, as this flag is only tested during the init ioctl itself. Acked-by: Marc Zyngier Signed-off-by: Christoffer Dall Signed-off-by: Shannon Zhao Signed-off-by: Jiri Slaby --- arch/arm/kvm/arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index bac1ba5b3960..7dc8e010c200 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -676,7 +676,7 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, /* * Handle the "start in power-off" case by marking the VCPU as paused. */ - if (__test_and_clear_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) + if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) vcpu->arch.pause = true; return 0;