summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Nyberg <alexn@telia.com>2005-04-22 10:22:07 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-22 10:22:07 -0700
commitefab7739d99eae948971140b2aa3dddf7f72c900 (patch)
treed0278bb7304946182dd4337fcbceb9fc32fb2901
parent21b7ef0c6c62a14bc8e1c8c0af4e1f0ba3a56d66 (diff)
downloadlinux-efab7739d99eae948971140b2aa3dddf7f72c900.tar.gz
linux-efab7739d99eae948971140b2aa3dddf7f72c900.tar.bz2
linux-efab7739d99eae948971140b2aa3dddf7f72c900.zip
[PATCH] x86_64: fix new out of line put_user()
The labels after the last put_user patch were misplaced so exceptions on the real mov instructions would not be handled. Noted by Brian Gerst <bgerst@didntduck.org>
-rw-r--r--arch/x86_64/lib/putuser.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86_64/lib/putuser.S b/arch/x86_64/lib/putuser.S
index d9d3e5ec9ad1..5828b8191667 100644
--- a/arch/x86_64/lib/putuser.S
+++ b/arch/x86_64/lib/putuser.S
@@ -49,8 +49,8 @@ __put_user_2:
jc 20f
cmpq threadinfo_addr_limit(%r8),%rcx
jae 20f
-2: decq %rcx
- movw %dx,(%rcx)
+ decq %rcx
+2: movw %dx,(%rcx)
xorl %eax,%eax
ret
20: decq %rcx
@@ -64,8 +64,8 @@ __put_user_4:
jc 30f
cmpq threadinfo_addr_limit(%r8),%rcx
jae 30f
-3: subq $3,%rcx
- movl %edx,(%rcx)
+ subq $3,%rcx
+3: movl %edx,(%rcx)
xorl %eax,%eax
ret
30: subq $3,%rcx
@@ -79,8 +79,8 @@ __put_user_8:
jc 40f
cmpq threadinfo_addr_limit(%r8),%rcx
jae 40f
-4: subq $7,%rcx
- movq %rdx,(%rcx)
+ subq $7,%rcx
+4: movq %rdx,(%rcx)
xorl %eax,%eax
ret
40: subq $7,%rcx