| commit | 243412be9cecfc7fddebb912a277b76119fd4ecd | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Sun May 20 00:05:58 2012 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Mon May 21 16:28:34 2012 -0400 |
| tree | b74b7d87db67aed2a22acb7571a4349d3507f9b3 | |
| parent | c6802f4370510fa8674674f11c5578ee057d1d63 [diff] [blame] |
um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index c6c7131..baba84f 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c
@@ -219,7 +219,7 @@ 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;