summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/ptrace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-04 21:40:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-04 21:40:17 -0800
commit0efcafb0fb7a163999a8821e8a5e7792fca90a2d (patch)
tree649d16382e562f595ec55b2aa9ec0d8c5824629b /arch/sparc64/kernel/ptrace.c
parente948990f958c6c41036a99c8a6581e35e7e23d80 (diff)
parent410d2c8187ed969238ba98008c1d57307a56cfd8 (diff)
downloadop-kernel-dev-0efcafb0fb7a163999a8821e8a5e7792fca90a2d.zip
op-kernel-dev-0efcafb0fb7a163999a8821e8a5e7792fca90a2d.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Sync FPU state in VIS emulation handler. sparc64: Fix VIS emulation bugs sparc: asm/bitops.h should define __fls sparc64: Fix bug in PTRACE_SETFPREGS64 handling.
Diffstat (limited to 'arch/sparc64/kernel/ptrace.c')
-rw-r--r--arch/sparc64/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index f43adbc..a941c61 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break;
case PTRACE_SETFPREGS64:
- ret = copy_regset_to_user(child, view, REGSET_FP,
+ ret = copy_regset_from_user(child, view, REGSET_FP,
0 * sizeof(u64),
33 * sizeof(u64),
fps);
OpenPOWER on IntegriCloud