From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 23 May 2015 14:47:12 +0000 (+0200)
Subject: Merge branch 'linus' into x86/fpu
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3152657f104ce9b0f80793c92a745d5e97b43812;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'linus' into x86/fpu

Resolve semantic conflict in arch/x86/kvm/cpuid.c with:

  c447e76b4cab ("kvm/fpu: Enable eager restore kvm FPU for MPX")

By removing the FPU internal include files.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

3152657f104ce9b0f80793c92a745d5e97b43812
diff --cc arch/x86/kvm/x86.c
index e14a7a65e975,ea306adbbc13..989cfc01e2a5
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -7042,10 -7057,12 +7042,12 @@@ void kvm_put_guest_fpu(struct kvm_vcpu 
  		return;
  
  	vcpu->guest_fpu_loaded = 0;
 -	fpu_save_init(&vcpu->arch.guest_fpu);
 +	copy_fpregs_to_fpstate(&vcpu->arch.guest_fpu);
  	__kernel_fpu_end();
  	++vcpu->stat.fpu_reload;
- 	kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu);
+ 	if (!vcpu->arch.eager_fpu)
+ 		kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu);
+ 
  	trace_kvm_fpu(0);
  }