diff options
author | Rik van Riel <riel@redhat.com> | 2016-10-04 20:34:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-10-07 05:14:41 -0400 |
commit | 3d42de25d290fdfe604835d1b389845b8cba5bff (patch) | |
tree | 62dd9f07a44b85d1ae1e7e998094d67dd2ad6d3f | |
parent | 3913cc3507575273beb165a5e027a081913ed507 (diff) |
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 <riel@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: pbonzini@redhat.com
Link: http://lkml.kernel.org/r/1475627678-20788-7-git-send-email-riel@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kvm/x86.c | 4 | ||||
-rw-r--r-- | include/linux/kvm_host.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 59d7761fd6df..2c7e775d7295 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) | |||
7348 | 7348 | ||
7349 | void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) | 7349 | void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) |
7350 | { | 7350 | { |
7351 | if (!vcpu->guest_fpu_loaded) { | 7351 | if (!vcpu->guest_fpu_loaded) |
7352 | vcpu->fpu_counter = 0; | ||
7353 | return; | 7352 | return; |
7354 | } | ||
7355 | 7353 | ||
7356 | vcpu->guest_fpu_loaded = 0; | 7354 | vcpu->guest_fpu_loaded = 0; |
7357 | copy_fpregs_to_fpstate(&vcpu->arch.guest_fpu); | 7355 | copy_fpregs_to_fpstate(&vcpu->arch.guest_fpu); |
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9c28b4d4c90b..4e6905cd1e8e 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
@@ -224,7 +224,6 @@ struct kvm_vcpu { | |||
224 | 224 | ||
225 | int fpu_active; | 225 | int fpu_active; |
226 | int guest_fpu_loaded, guest_xcr0_loaded; | 226 | int guest_fpu_loaded, guest_xcr0_loaded; |
227 | unsigned char fpu_counter; | ||
228 | struct swait_queue_head wq; | 227 | struct swait_queue_head wq; |
229 | struct pid *pid; | 228 | struct pid *pid; |
230 | int sigset_active; | 229 | int sigset_active; |