diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:42 +0100 |
| commit | 0c3334d02d93988c106340d85b641e23b9087abb (patch) | |
| tree | e96abc7617cfc2125be89ca765e86cdd9a1f06cd /arch/x86/kernel/fpu/xstate.c | |
| parent | 09e05e96cbb3e437b919a99b29ed0e59db9724cb (diff) | |
| parent | d9227958dc0e56976eaf452a213aee8415a9eb60 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.06-rt
Diffstat (limited to 'arch/x86/kernel/fpu/xstate.c')
| -rw-r--r-- | arch/x86/kernel/fpu/xstate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 70fc312221fc..3fa200ecca62 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -632,8 +632,7 @@ void __init fpu__init_system_xstate(void) BUG(); } - /* Support only the state known to the OS: */ - xfeatures_mask = xfeatures_mask & XCNTXT_MASK; + xfeatures_mask &= fpu__get_supported_xfeatures_mask(); /* Enable xstate instructions to be able to continue with initialization: */ fpu__init_cpu_xstate(); |