diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-20 08:05:58 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-22 00:28:34 +0400 |
| commit | 243412be9cecfc7fddebb912a277b76119fd4ecd (patch) | |
| tree | b74b7d87db67aed2a22acb7571a4349d3507f9b3 /arch/x86/um/tls_32.c | |
| parent | c6802f4370510fa8674674f11c5578ee057d1d63 (diff) | |
| download | linux-243412be9cecfc7fddebb912a277b76119fd4ecd.tar.xz | |
um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/um/tls_32.c')
| -rw-r--r-- | arch/x86/um/tls_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index c6c7131e563b..baba84f8ecb8 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c @@ -219,7 +219,7 @@ int arch_copy_tls(struct task_struct *new) int idx, ret = -EFAULT; if (copy_from_user(&info, - (void __user *) UPT_ESI(&new->thread.regs.regs), + (void __user *) UPT_SI(&new->thread.regs.regs), sizeof(info))) goto out; |