From patchwork Wed Jul 10 22:47:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 2825939 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F107CC0AB2 for ; Wed, 10 Jul 2013 22:48:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29F0520121 for ; Wed, 10 Jul 2013 22:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DDAD2011D for ; Wed, 10 Jul 2013 22:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754698Ab3GJWsC (ORCPT ); Wed, 10 Jul 2013 18:48:02 -0400 Received: from co1ehsobe002.messaging.microsoft.com ([216.32.180.185]:51461 "EHLO co1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753834Ab3GJWr6 (ORCPT ); Wed, 10 Jul 2013 18:47:58 -0400 Received: from mail201-co1-R.bigfish.com (10.243.78.249) by CO1EHSOBE017.bigfish.com (10.243.66.80) with Microsoft SMTP Server id 14.1.225.22; Wed, 10 Jul 2013 22:47:58 +0000 Received: from mail201-co1 (localhost [127.0.0.1]) by mail201-co1-R.bigfish.com (Postfix) with ESMTP id F3398A80476; Wed, 10 Jul 2013 22:47:57 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e23h1155h) Received: from mail201-co1 (localhost.localdomain [127.0.0.1]) by mail201-co1 (MessageSwitch) id 1373496476147998_12445; Wed, 10 Jul 2013 22:47:56 +0000 (UTC) Received: from CO1EHSMHS014.bigfish.com (unknown [10.243.78.247]) by mail201-co1.bigfish.com (Postfix) with ESMTP id 1708744004A; Wed, 10 Jul 2013 22:47:56 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS014.bigfish.com (10.243.66.24) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 10 Jul 2013 22:47:55 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.3.136.1; Wed, 10 Jul 2013 22:47:01 +0000 Received: from snotra.am.freescale.net ([10.214.81.48]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r6AMlfJR030635; Wed, 10 Jul 2013 15:47:53 -0700 From: Scott Wood To: Alexander Graf CC: , , Scott Wood Subject: [PATCH 3/3] kvm/ppc/booke: Don't call kvm_guest_enter twice Date: Wed, 10 Jul 2013 17:47:41 -0500 Message-ID: <1373496461-2668-4-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1373496461-2668-1-git-send-email-scottwood@freescale.com> References: <1373496461-2668-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kvm_guest_enter() was already called by kvmppc_prepare_to_enter(). Don't call it again. Signed-off-by: Scott Wood --- arch/powerpc/kvm/booke.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index aa3bc36..57c1462 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -672,8 +672,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) goto out; } - kvm_guest_enter(); - #ifdef CONFIG_PPC_FPU /* Save userspace FPU state in stack */ enable_kernel_fp();