redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

x86/fpu: Move restore_init_xstate() out of fpu/internal.h 

Move restore_init_xstate() next to its sole caller.

Also rename it to copy_init_fpstate_to_fpregs() and add
some comments about what it does.

Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
hifive-unleashed-5.1
Ingo Molnar 2015-04-30 11:21:59 +02:00
parent 6f57502310
commit 815418890e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/include/asm/fpu/internal.h
View File

@ -341,14 +341,6 @@ static inline void fpregs_deactivate(struct fpu *fpu)
__fpregs_deactivate_hw();
}
static inline void restore_init_xstate(void)
{
if (use_xsave())
xrstor_state(&init_fpstate.xsave, -1);
else
fxrstor_checking(&init_fpstate.fxsave);
}
/*
* Definitions for the eXtended Control Register instructions
*/

14
arch/x86/kernel/fpu/core.c
View File

@ -391,6 +391,18 @@ void fpu__drop(struct fpu *fpu)
preempt_enable();
}
/*
* Clear FPU registers by setting them up from
* the init fpstate:
*/
static inline void copy_init_fpstate_to_fpregs(void)
{
if (use_xsave())
xrstor_state(&init_fpstate.xsave, -1);
else
fxrstor_checking(&init_fpstate.fxsave);
}
/*
* Clear the FPU state back to init state.
*
@ -409,7 +421,7 @@ void fpu__clear(struct fpu *fpu)
fpu__activate_curr(fpu);
user_fpu_begin();
}
restore_init_xstate();
copy_init_fpstate_to_fpregs();
}
}