Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754746AbcJGJrD (ORCPT ); Fri, 7 Oct 2016 05:47:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34090 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221AbcJGJqy (ORCPT ); Fri, 7 Oct 2016 05:46:54 -0400 Date: Fri, 7 Oct 2016 02:45:51 -0700 From: tip-bot for Rik van Riel Message-ID: Cc: mingo@kernel.org, brgerst@gmail.com, quentin.casasnovas@oracle.com, riel@redhat.com, dvlasenk@redhat.com, torvalds@linux-foundation.org, jpoimboe@redhat.com, bp@alien8.de, oleg@redhat.com, hpa@zytor.com, peterz@infradead.org, dave.hansen@linux.intel.com, tglx@linutronix.de, luto@kernel.org, fenghua.yu@intel.com, linux-kernel@vger.kernel.org Reply-To: luto@kernel.org, fenghua.yu@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@alien8.de, hpa@zytor.com, oleg@redhat.com, peterz@infradead.org, dave.hansen@linux.intel.com, jpoimboe@redhat.com, dvlasenk@redhat.com, torvalds@linux-foundation.org, brgerst@gmail.com, quentin.casasnovas@oracle.com, riel@redhat.com, mingo@kernel.org In-Reply-To: <1475627678-20788-7-git-send-email-riel@redhat.com> References: <1475627678-20788-7-git-send-email-riel@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu, kvm: Remove KVM vcpu->fpu_counter Git-Commit-ID: 3d42de25d290fdfe604835d1b389845b8cba5bff X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2085 Lines: 62 Commit-ID: 3d42de25d290fdfe604835d1b389845b8cba5bff Gitweb: http://git.kernel.org/tip/3d42de25d290fdfe604835d1b389845b8cba5bff Author: Rik van Riel AuthorDate: Tue, 4 Oct 2016 20:34:35 -0400 Committer: Ingo Molnar CommitDate: Fri, 7 Oct 2016 11:14:41 +0200 x86/fpu, kvm: Remove KVM vcpu->fpu_counter With the removal of the lazy FPU code, this field is no longer used. Get rid of it. Signed-off-by: Rik van Riel Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Quentin Casasnovas Cc: Thomas Gleixner Cc: pbonzini@redhat.com Link: http://lkml.kernel.org/r/1475627678-20788-7-git-send-email-riel@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kvm/x86.c | 4 +--- include/linux/kvm_host.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 59d7761..2c7e775 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7348,10 +7348,8 @@ void kvm_load_guest_fpu(struct kvm_vcpu *vcpu) void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) { - if (!vcpu->guest_fpu_loaded) { - vcpu->fpu_counter = 0; + if (!vcpu->guest_fpu_loaded) return; - } vcpu->guest_fpu_loaded = 0; copy_fpregs_to_fpstate(&vcpu->arch.guest_fpu); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9c28b4d..4e6905c 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -224,7 +224,6 @@ struct kvm_vcpu { int fpu_active; int guest_fpu_loaded, guest_xcr0_loaded; - unsigned char fpu_counter; struct swait_queue_head wq; struct pid *pid; int sigset_active;