git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
x86_64
/
lib
/
putuser.S
diff --git
a/arch/x86_64/lib/putuser.S
b/arch/x86_64/lib/putuser.S
index
4989f5a
..
7f55939
100644
(file)
--- a/
arch/x86_64/lib/putuser.S
+++ b/
arch/x86_64/lib/putuser.S
@@
-25,26
+25,25
@@
*/
#include <linux/linkage.h>
*/
#include <linux/linkage.h>
-#include <asm/dwarf2.h>
#include <asm/page.h>
#include <asm/errno.h>
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
.text
#include <asm/page.h>
#include <asm/errno.h>
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
.text
-ENTRY(__put_user_1)
- CFI_STARTPROC
+ .p2align 4
+.globl __put_user_1
+__put_user_1:
GET_THREAD_INFO(%r8)
cmpq threadinfo_addr_limit(%r8),%rcx
jae bad_put_user
1: movb %dl,(%rcx)
xorl %eax,%eax
ret
GET_THREAD_INFO(%r8)
cmpq threadinfo_addr_limit(%r8),%rcx
jae bad_put_user
1: movb %dl,(%rcx)
xorl %eax,%eax
ret
- CFI_ENDPROC
-ENDPROC(__put_user_1)
-ENTRY(__put_user_2)
- CFI_STARTPROC
+ .p2align 4
+.globl __put_user_2
+__put_user_2:
GET_THREAD_INFO(%r8)
addq $1,%rcx
jc 20f
GET_THREAD_INFO(%r8)
addq $1,%rcx
jc 20f
@@
-56,11
+55,10
@@
ENTRY(__put_user_2)
ret
20: decq %rcx
jmp bad_put_user
ret
20: decq %rcx
jmp bad_put_user
- CFI_ENDPROC
-ENDPROC(__put_user_2)
-ENTRY(__put_user_4)
- CFI_STARTPROC
+ .p2align 4
+.globl __put_user_4
+__put_user_4:
GET_THREAD_INFO(%r8)
addq $3,%rcx
jc 30f
GET_THREAD_INFO(%r8)
addq $3,%rcx
jc 30f
@@
-72,11
+70,10
@@
ENTRY(__put_user_4)
ret
30: subq $3,%rcx
jmp bad_put_user
ret
30: subq $3,%rcx
jmp bad_put_user
- CFI_ENDPROC
-ENDPROC(__put_user_4)
-ENTRY(__put_user_8)
- CFI_STARTPROC
+ .p2align 4
+.globl __put_user_8
+__put_user_8:
GET_THREAD_INFO(%r8)
addq $7,%rcx
jc 40f
GET_THREAD_INFO(%r8)
addq $7,%rcx
jc 40f
@@
-88,15
+85,10
@@
ENTRY(__put_user_8)
ret
40: subq $7,%rcx
jmp bad_put_user
ret
40: subq $7,%rcx
jmp bad_put_user
- CFI_ENDPROC
-ENDPROC(__put_user_8)
bad_put_user:
bad_put_user:
- CFI_STARTPROC
movq $(-EFAULT),%rax
ret
movq $(-EFAULT),%rax
ret
- CFI_ENDPROC
-END(bad_put_user)
.section __ex_table,"a"
.quad 1b,bad_put_user
.section __ex_table,"a"
.quad 1b,bad_put_user