From patchwork Thu Apr 30 09:25:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47782 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C9C8C20553 for ; Thu, 30 Apr 2015 09:26:01 +0000 (UTC) Received: by lbos2 with SMTP id s2sf12904514lbo.2 for ; Thu, 30 Apr 2015 02:26:00 -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=q4H7QFSQL1QtFBTnH/MVG0ai8d3UnyLpygQfeEEOow8=; b=VZSX/uyDUIEwOQRaEGgMIWBQWaTs8N/4sOeo6p4geFUn9SfNwUJULVYl+QRQQyRKr4 pmsCVLAMv/lEzPBJlpcfBg+w/maraKrerdcKs0oj/VpnGyF3r0pu2+llHHpugEtgYCTD 9r0b+cH7Wpu8xWhQYmPXRUK4DNSImTNwSmvw+zQ25cJt56XS1UWXVW5u5uSp2sp1Oh0k WCwru3GMAPGg7mcPDhsWvgolPNFkhUUAjQpDtc4AF+m8QfiZFb5yhgnNqcbZm1KTFZQr 5mt54l94YgEqEdHwdirAurjYGJlZLJ90oj5sbUeQkQaeC50zmWe8b1Hi8GL47g3sdM3q KYmg== X-Gm-Message-State: ALoCoQm/mP/fIpSiURCr2Tjz5+6dwECVwj7KqkCDGtugDwCtQEjbcNhGkFjyliWDUUo1dxVPCtp4 X-Received: by 10.152.184.73 with SMTP id es9mr2016580lac.4.1430385960822; Thu, 30 Apr 2015 02:26:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.163 with SMTP id an3ls355088lac.90.gmail; Thu, 30 Apr 2015 02:26:00 -0700 (PDT) X-Received: by 10.152.45.97 with SMTP id l1mr3028940lam.55.1430385960711; Thu, 30 Apr 2015 02:26:00 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id ku3si1341303lbb.54.2015.04.30.02.26.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 02:26:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagv1 with SMTP id v1so39521292lag.3 for ; Thu, 30 Apr 2015 02:26:00 -0700 (PDT) X-Received: by 10.112.204.72 with SMTP id kw8mr3006878lbc.88.1430385960438; Thu, 30 Apr 2015 02:26:00 -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 l1csp2995549lbt; Thu, 30 Apr 2015 02:25:59 -0700 (PDT) X-Received: by 10.70.108.137 with SMTP id hk9mr6441680pdb.105.1430385936359; Thu, 30 Apr 2015 02:25:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nf2si2640288pbc.149.2015.04.30.02.25.35; Thu, 30 Apr 2015 02:25:36 -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 S1751304AbbD3JZ3 (ORCPT + 2 others); Thu, 30 Apr 2015 05:25:29 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:52990 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751308AbbD3JZO (ORCPT ); Thu, 30 Apr 2015 05:25:14 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnkiW-0005PN-E7; Thu, 30 Apr 2015 11:25:12 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Christoffer Dall , Shannon Zhao , Jiri Slaby Subject: [patch added to the 3.12 stable tree] arm/arm64: KVM: Don't clear the VCPU_POWER_OFF flag Date: Thu, 30 Apr 2015 11:25:02 +0200 Message-Id: <1430385911-20480-54-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1430385911-20480-1-git-send-email-jslaby@suse.cz> References: <1430385911-20480-1-git-send-email-jslaby@suse.cz> 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.49 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 This patch has been added to the 3.12 stable tree. If you have any objections, please let us 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;