diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 07:18:39 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 07:18:39 (GMT) |
commit | accf0fa697eeb5ff4c2360edc4da5b10abac0b7b (patch) | |
tree | a57dc9aa4a6b83be8ac8b4528cf06db5621e62aa /arch/x86/power/cpu_32.c | |
parent | ebd60cd64f8ab1170102c3ab072eb73042b7a33d (diff) | |
parent | fe47784ba5cbb6b713c013e046859946789b45e4 (diff) | |
download | linux-accf0fa697eeb5ff4c2360edc4da5b10abac0b7b.tar.xz |
Merge branch 'x86/xsave' into x86/core
Diffstat (limited to 'arch/x86/power/cpu_32.c')
-rw-r--r-- | arch/x86/power/cpu_32.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c index d3e083d..274d060 100644 --- a/arch/x86/power/cpu_32.c +++ b/arch/x86/power/cpu_32.c @@ -11,6 +11,7 @@ #include <linux/suspend.h> #include <asm/mtrr.h> #include <asm/mce.h> +#include <asm/xcr.h> static struct saved_context saved_context; @@ -126,6 +127,12 @@ static void __restore_processor_state(struct saved_context *ctxt) if (boot_cpu_has(X86_FEATURE_SEP)) enable_sep_cpu(); + /* + * restore XCR0 for xsave capable cpu's. + */ + if (cpu_has_xsave) + xsetbv(XCR_XFEATURE_ENABLED_MASK, pcntxt_mask); + fix_processor_context(); do_fpu_end(); mtrr_ap_init(); |