From patchwork Mon May 11 11:16:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 48251 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7C17C21550 for ; Mon, 11 May 2015 11:19:35 +0000 (UTC) Received: by wiun10 with SMTP id n10sf24924140wiu.1 for ; Mon, 11 May 2015 04:19:34 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=qXMw1GwF4oeEDusdytWtclSloOMu9Yps0kQIeT4SKCw=; b=Z7b+E9psQ27x9r8+U8jzs1c9VglMJAaDlp5dt9ohfRQxonh95QnF371q8NK2eJgQ5w gjXhu6lEZSMP/SStFOiL7qtsDQdXqh5AsnnCTOB8JlsD7awdVxLMtMQN1L2fMl202VdX Hkw5Qn4KJpyzjbqixQV23VivBuJnS+CLk7qsYiA2hwrDkgdO76o2Mj9MkDpTxLg/NnYD 1jvDmMT81yYwfQSufDYrvk2COyKWdcxY3PtB6HLxHiq/P1IBsbuTMipsx8kUEBC8d+10 Kz4nLcrupyClZVK99EvUf37tRsH1DI3SaZpeM5y6cQnjiux6iXi5WRjs4E62eNBwnAvg TC5A== X-Gm-Message-State: ALoCoQl+n6pWSCsc7GTkKIp4OFqXBCVjmXrYxfVY1SsgepXF3f6hHYx8WDebHp5fBLNNJT2TvtqU X-Received: by 10.152.184.73 with SMTP id es9mr7220744lac.4.1431343174710; Mon, 11 May 2015 04:19:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.162 with SMTP id g2ls624775lae.80.gmail; Mon, 11 May 2015 04:19:34 -0700 (PDT) X-Received: by 10.152.7.209 with SMTP id l17mr7803672laa.100.1431343174591; Mon, 11 May 2015 04:19:34 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id u4si8183777lbk.78.2015.05.11.04.19.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 04:19:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbzk7 with SMTP id zk7so91388102lbb.0 for ; Mon, 11 May 2015 04:19:34 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr7692523lbb.36.1431343174313; Mon, 11 May 2015 04:19:34 -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.108.230 with SMTP id hn6csp1444502lbb; Mon, 11 May 2015 04:19:33 -0700 (PDT) X-Received: by 10.70.89.199 with SMTP id bq7mr18055035pdb.168.1431343171513; Mon, 11 May 2015 04:19:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cf1si17583618pdb.112.2015.05.11.04.19.30; Mon, 11 May 2015 04:19:31 -0700 (PDT) Received-SPF: none (google.com: stable-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 S1753955AbbEKLT3 (ORCPT + 2 others); Mon, 11 May 2015 07:19:29 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:26246 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753954AbbEKLT2 (ORCPT ); Mon, 11 May 2015 07:19:28 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4BBJQ0N003267 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 May 2015 11:19:26 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t4BBJPiv008269 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 11 May 2015 11:19:25 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t4BBJP9a004250; Mon, 11 May 2015 11:19:25 GMT Received: from lappy.hsd1.nh.comcast.net (/10.159.243.153) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 May 2015 04:19:25 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: Christoffer Dall , Shannon Zhao , Sasha Levin Subject: [added to the 3.18 stable tree] arm/arm64: KVM: Don't clear the VCPU_POWER_OFF flag Date: Mon, 11 May 2015 07:16:25 -0400 Message-Id: <1431343152-19437-4-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431343152-19437-1-git-send-email-sasha.levin@oracle.com> References: <1431343152-19437-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.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.217.182 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 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: Sasha Levin --- 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 9e193c8..b160bea 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -661,7 +661,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;