diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-02-19 11:17:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-19 11:19:05 +0100 |
| commit | f353e612304ba752d6b613dc02eae8116cd3e27b (patch) | |
| tree | a43ba46e221d91e5b958f9e30a23139166947f78 /arch/x86/kernel/traps.c | |
| parent | Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/fpu: Also check fpu_lazy_restore() when use_eager_fpu() (diff) | |
| download | linux-dev-f353e612304ba752d6b613dc02eae8116cd3e27b.tar.xz linux-dev-f353e612304ba752d6b613dc02eae8116cd3e27b.zip | |
Merge branch 'tip-x86-fpu' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/fpu
Pull FPU updates from Borislav Petkov:
"A round of updates to the FPU maze from Oleg and Rik. It should make
the code a bit more understandable/readable/streamlined and a preparation
for more cleanups and improvements in that area."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 9d2073e2ecc9..92b83e299ed3 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -734,7 +734,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr) /* * Save the info for the exception handler and clear the error. */ - save_init_fpu(task); + unlazy_fpu(task); task->thread.trap_nr = trapnr; task->thread.error_code = error_code; info.si_signo = SIGFPE; |