From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 10 Mar 2016 15:47:02 +0000 (+0100)
Subject: x86/xstate: undo bogus adjustment to xsave()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1566
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3cdad9183aefc422d19271a09ad01f7dda1f0cde;p=xen.git

x86/xstate: undo bogus adjustment to xsave()

This reverts an unintended change in commit 879b44b041 ("x86/fpu: add
a per-domain field to set the width of FIP/FDP"), which I had done
intermediately while fixing the build issue: After having reverted that
adjustment I must have forgotten to "git add" the adjustment.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c
index 8316bd98a9..a5ed9e5465 100644
--- a/xen/arch/x86/xstate.c
+++ b/xen/arch/x86/xstate.c
@@ -292,7 +292,7 @@ void xsave(struct vcpu *v, uint64_t mask)
 
         XSAVE("0x48,");
 
-        if ( !(ptr->xsave_hdr.xstate_bv & XSTATE_FP) ||
+        if ( !(mask & ptr->xsave_hdr.xstate_bv & XSTATE_FP) ||
              /*
               * AMD CPUs don't save/restore FDP/FIP/FOP unless an exception
               * is pending.