diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 01:54:59 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 01:54:59 (GMT) |
| commit | 7d8eb50290e4edf8de36973728862f73ff0b94bc (patch) | |
| tree | 858c605f425d928b7b893b378a76b869e6f250db /arch/um/kernel | |
| parent | 23a3e178b9f8be3a900c7b11d795e54b4a131af0 (diff) | |
| parent | a78ff1112263fdd871d3506dbcff44f6f12e8423 (diff) | |
| download | linux-7d8eb50290e4edf8de36973728862f73ff0b94bc.tar.xz | |
Merge branch 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
"This contains a nice FPU fixup from Eli Cooper for UML"
* 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: add extended processor state save/restore support
um: extend fpstate to _xstate to support YMM registers
um: fix FPU state preservation around signal handlers
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 0b04711..034b42c7 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -398,6 +398,6 @@ int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu) { int cpu = current_thread_info()->cpu; - return save_fp_registers(userspace_pid[cpu], (unsigned long *) fpu); + return save_i387_registers(userspace_pid[cpu], (unsigned long *) fpu); } |