diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 03:54:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 03:54:59 +0200 |
| commit | 7d8eb50290e4edf8de36973728862f73ff0b94bc (patch) | |
| tree | 858c605f425d928b7b893b378a76b869e6f250db /arch/x86/um/ptrace_32.c | |
| parent | Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | um: add extended processor state save/restore support (diff) | |
| download | linux-7d8eb50290e4edf8de36973728862f73ff0b94bc.tar.xz linux-7d8eb50290e4edf8de36973728862f73ff0b94bc.zip | |
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/x86/um/ptrace_32.c')
| -rw-r--r-- | arch/x86/um/ptrace_32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/um/ptrace_32.c b/arch/x86/um/ptrace_32.c index 47c78d5e5c32..ebd4dd6ef73b 100644 --- a/arch/x86/um/ptrace_32.c +++ b/arch/x86/um/ptrace_32.c @@ -194,7 +194,8 @@ static int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *c int err, n, cpu = ((struct thread_info *) child->stack)->cpu; struct user_i387_struct fpregs; - err = save_fp_registers(userspace_pid[cpu], (unsigned long *) &fpregs); + err = save_i387_registers(userspace_pid[cpu], + (unsigned long *) &fpregs); if (err) return err; @@ -214,7 +215,7 @@ static int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *c if (n > 0) return -EFAULT; - return restore_fp_registers(userspace_pid[cpu], + return restore_i387_registers(userspace_pid[cpu], (unsigned long *) &fpregs); } |