diff options
| author | Richard Weinberger <richard@nod.at> | 2012-05-21 23:25:37 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-05-21 23:25:37 +0200 |
| commit | 2ccf62b36097aa88e0ea152d6ef0c0ca2d3884e6 (patch) | |
| tree | bc93e28e0e72fa0cc8c20f64f9e1f3657ad5e479 /arch/x86/um/tls_32.c | |
| parent | 875682648b89a3ebc06176d60dc280f810647839 (diff) | |
| parent | ffc51be82b17e1c515fdb2dd5b92605798216b30 (diff) | |
Merge branch 'for-um' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal into for-3.5
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; |