From patchwork Sun May 17 01:02: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: 48614 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB57021411 for ; Sun, 17 May 2015 01:06:30 +0000 (UTC) Received: by wgvl6 with SMTP id l6sf40766525wgv.2 for ; Sat, 16 May 2015 18:06:30 -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=kknC9sZAkkc6nA+xDEdqqX5yL0oqICTuiV8cCdmWba+5wsqvHRSMMBnvXxVSVQWJ08 atI5RmXIM7+hwp+epjSt/m6OcRG5QF0G5I0rNsDidJYykTtcLeJTNxGkl4fAjvcByu1a qHGie2tw70lXEKRgFK/Xh25yvugwoWGIei5EIjHgCto5ue42k88Swn3HNqJhFjIsg9uZ hW743wIoBCQXwt7FSZFdeEB+wNbrv9AEH20Y0WiZwc+S6ra01hH6fLQs5Y3ZbxqybpoZ yAYBTHwron5IOjE0HFUoL6V34glAasA05ILoAIOOtkcBjrx1mRmUxfkQF5YLylGBcz6W mBMw== X-Gm-Message-State: ALoCoQk2mkayR4bhGirF2e1h3EEN8z+wuiz3ThZWTHvAkEbXP5MJKP6KaBhwf3DonsMRLjDCuk5d X-Received: by 10.113.11.3 with SMTP id ee3mr12548026lbd.9.1431824790067; Sat, 16 May 2015 18:06:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.67 with SMTP id da3ls733764lad.49.gmail; Sat, 16 May 2015 18:06:29 -0700 (PDT) X-Received: by 10.112.159.9 with SMTP id wy9mr11990276lbb.120.1431824789876; Sat, 16 May 2015 18:06:29 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id qa2si3889324lbb.153.2015.05.16.18.06.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 18:06:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labbd9 with SMTP id bd9so172856364lab.2 for ; Sat, 16 May 2015 18:06:29 -0700 (PDT) X-Received: by 10.152.29.161 with SMTP id l1mr12208349lah.76.1431824789560; Sat, 16 May 2015 18:06:29 -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 hn6csp3022111lbb; Sat, 16 May 2015 18:06:28 -0700 (PDT) X-Received: by 10.68.69.15 with SMTP id a15mr20058691pbu.141.1431824781225; Sat, 16 May 2015 18:06:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si9275368pdm.194.2015.05.16.18.06.20; Sat, 16 May 2015 18:06:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750849AbbEQBGQ (ORCPT + 2 others); Sat, 16 May 2015 21:06:16 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:25928 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbbEQBGP (ORCPT ); Sat, 16 May 2015 21:06:15 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4H16Ef1028442 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 17 May 2015 01:06:14 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t4H16D15010903 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Sun, 17 May 2015 01:06:13 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t4H16DPT029446; Sun, 17 May 2015 01:06:13 GMT Received: from lappy.hsd1.nh.comcast.net (/10.159.157.103) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 16 May 2015 18:06:13 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: sasha.levin@oracle.com Subject: [PATCH 3.18 004/222] arm/arm64: KVM: Don't clear the VCPU_POWER_OFF flag Date: Sat, 16 May 2015 21:02:25 -0400 Message-Id: <1431824764-20044-5-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431824764-20044-1-git-send-email-sasha.levin@oracle.com> References: <1431824764-20044-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] 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.215.45 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;