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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
x86_64
/
ia32
/
ia32entry.S
diff --git
a/arch/x86_64/ia32/ia32entry.S
b/arch/x86_64/ia32/ia32entry.S
index
e1b1a99
..
6595b35
100644
(file)
--- a/
arch/x86_64/ia32/ia32entry.S
+++ b/
arch/x86_64/ia32/ia32entry.S
@@
-13,7
+13,6
@@
#include <asm/thread_info.h>
#include <asm/segment.h>
#include <asm/vsyscall32.h>
#include <asm/thread_info.h>
#include <asm/segment.h>
#include <asm/vsyscall32.h>
-#include <asm/irqflags.h>
#include <linux/linkage.h>
#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
#include <linux/linkage.h>
#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
@@
-76,10
+75,6
@@
ENTRY(ia32_sysenter_target)
swapgs
movq %gs:pda_kernelstack, %rsp
addq $(PDA_STACKOFFSET),%rsp
swapgs
movq %gs:pda_kernelstack, %rsp
addq $(PDA_STACKOFFSET),%rsp
- /*
- * No need to follow this irqs on/off section: the syscall
- * disabled irqs, here we enable it straight after entry:
- */
sti
movl %ebp,%ebp /* zero extension */
pushq $__USER32_DS
sti
movl %ebp,%ebp /* zero extension */
pushq $__USER32_DS
@@
-103,7
+98,7
@@
ENTRY(ia32_sysenter_target)
pushq %rax
CFI_ADJUST_CFA_OFFSET 8
cld
pushq %rax
CFI_ADJUST_CFA_OFFSET 8
cld
- SAVE_ARGS 0,0,
0
+ SAVE_ARGS 0,0,
1
/* no need to do an access_ok check here because rbp has been
32bit zero extended */
1: movl (%rbp),%r9d
/* no need to do an access_ok check here because rbp has been
32bit zero extended */
1: movl (%rbp),%r9d
@@
-123,7
+118,6
@@
sysenter_do_call:
movq %rax,RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%r10)
cli
movq %rax,RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%r10)
cli
- TRACE_IRQS_OFF
testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
jnz int_ret_from_sys_call
andl $~TS_COMPAT,threadinfo_status(%r10)
testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
jnz int_ret_from_sys_call
andl $~TS_COMPAT,threadinfo_status(%r10)
@@
-138,7
+132,6
@@
sysenter_do_call:
CFI_REGISTER rsp,rcx
movl $VSYSCALL32_SYSEXIT,%edx /* User %eip */
CFI_REGISTER rip,rdx
CFI_REGISTER rsp,rcx
movl $VSYSCALL32_SYSEXIT,%edx /* User %eip */
CFI_REGISTER rip,rdx
- TRACE_IRQS_ON
swapgs
sti /* sti only takes effect after the next instruction */
/* sysexit */
swapgs
sti /* sti only takes effect after the next instruction */
/* sysexit */
@@
-162,7
+155,6
@@
sysenter_tracesys:
.previous
jmp sysenter_do_call
CFI_ENDPROC
.previous
jmp sysenter_do_call
CFI_ENDPROC
-ENDPROC(ia32_sysenter_target)
/*
* 32bit SYSCALL instruction entry.
/*
* 32bit SYSCALL instruction entry.
@@
-186,17
+178,13
@@
ENDPROC(ia32_sysenter_target)
*/
ENTRY(ia32_cstar_target)
CFI_STARTPROC32 simple
*/
ENTRY(ia32_cstar_target)
CFI_STARTPROC32 simple
- CFI_DEF_CFA rsp,
PDA_STACKOFFSET
+ CFI_DEF_CFA rsp,
0
CFI_REGISTER rip,rcx
/*CFI_REGISTER rflags,r11*/
swapgs
movl %esp,%r8d
CFI_REGISTER rsp,r8
movq %gs:pda_kernelstack,%rsp
CFI_REGISTER rip,rcx
/*CFI_REGISTER rflags,r11*/
swapgs
movl %esp,%r8d
CFI_REGISTER rsp,r8
movq %gs:pda_kernelstack,%rsp
- /*
- * No need to follow this irqs on/off section: the syscall
- * disabled irqs and here we enable it straight after entry:
- */
sti
SAVE_ARGS 8,1,1
movl %eax,%eax /* zero extension */
sti
SAVE_ARGS 8,1,1
movl %eax,%eax /* zero extension */
@@
-231,7
+219,6
@@
cstar_do_call:
movq %rax,RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%r10)
cli
movq %rax,RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%r10)
cli
- TRACE_IRQS_OFF
testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
jnz int_ret_from_sys_call
andl $~TS_COMPAT,threadinfo_status(%r10)
testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
jnz int_ret_from_sys_call
andl $~TS_COMPAT,threadinfo_status(%r10)
@@
-240,7
+227,6
@@
cstar_do_call:
CFI_REGISTER rip,rcx
movl EFLAGS-ARGOFFSET(%rsp),%r11d
/*CFI_REGISTER rflags,r11*/
CFI_REGISTER rip,rcx
movl EFLAGS-ARGOFFSET(%rsp),%r11d
/*CFI_REGISTER rflags,r11*/
- TRACE_IRQS_ON
movl RSP-ARGOFFSET(%rsp),%esp
CFI_RESTORE rsp
swapgs
movl RSP-ARGOFFSET(%rsp),%esp
CFI_RESTORE rsp
swapgs
@@
-263,7
+249,6
@@
cstar_tracesys:
.quad 1b,ia32_badarg
.previous
jmp cstar_do_call
.quad 1b,ia32_badarg
.previous
jmp cstar_do_call
-END(ia32_cstar_target)
ia32_badarg:
movq $-EFAULT,%rax
ia32_badarg:
movq $-EFAULT,%rax
@@
-299,11
+284,7
@@
ENTRY(ia32_syscall)
/*CFI_REL_OFFSET rflags,EFLAGS-RIP*/
/*CFI_REL_OFFSET cs,CS-RIP*/
CFI_REL_OFFSET rip,RIP-RIP
/*CFI_REL_OFFSET rflags,EFLAGS-RIP*/
/*CFI_REL_OFFSET cs,CS-RIP*/
CFI_REL_OFFSET rip,RIP-RIP
- swapgs
- /*
- * No need to follow this irqs on/off section: the syscall
- * disabled irqs and here we enable it straight after entry:
- */
+ swapgs
sti
movl %eax,%eax
pushq %rax
sti
movl %eax,%eax
pushq %rax
@@
-333,13
+314,16
@@
ia32_tracesys:
LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */
RESTORE_REST
jmp ia32_do_syscall
LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */
RESTORE_REST
jmp ia32_do_syscall
-END(ia32_syscall)
ia32_badsys:
movq $0,ORIG_RAX-ARGOFFSET(%rsp)
movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
jmp int_ret_from_sys_call
ia32_badsys:
movq $0,ORIG_RAX-ARGOFFSET(%rsp)
movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
jmp int_ret_from_sys_call
+ni_syscall:
+ movq %rax,%rdi
+ jmp sys32_ni_syscall
+
quiet_ni_syscall:
movq $-ENOSYS,%rax
ret
quiet_ni_syscall:
movq $-ENOSYS,%rax
ret
@@
-386,10
+370,10
@@
ENTRY(ia32_ptregs_common)
RESTORE_REST
jmp ia32_sysret /* misbalances the return cache */
CFI_ENDPROC
RESTORE_REST
jmp ia32_sysret /* misbalances the return cache */
CFI_ENDPROC
-END(ia32_ptregs_common)
.section .rodata,"a"
.align 8
.section .rodata,"a"
.align 8
+ .globl ia32_sys_call_table
ia32_sys_call_table:
.quad sys_restart_syscall
.quad sys_exit
ia32_sys_call_table:
.quad sys_restart_syscall
.quad sys_exit
@@
-711,8
+695,8
@@
ia32_sys_call_table:
.quad sys_readlinkat /* 305 */
.quad sys_fchmodat
.quad sys_faccessat
.quad sys_readlinkat /* 305 */
.quad sys_fchmodat
.quad sys_faccessat
- .quad
compat_sys_pselect6
- .quad
compat_sys_ppoll
+ .quad
quiet_ni_syscall /* pselect6 for now */
+ .quad
quiet_ni_syscall /* ppoll for now */
.quad sys_unshare /* 310 */
.quad compat_sys_set_robust_list
.quad compat_sys_get_robust_list
.quad sys_unshare /* 310 */
.quad compat_sys_set_robust_list
.quad compat_sys_get_robust_list
@@
-720,5
+704,4
@@
ia32_sys_call_table:
.quad sys_sync_file_range
.quad sys_tee
.quad compat_sys_vmsplice
.quad sys_sync_file_range
.quad sys_tee
.quad compat_sys_vmsplice
- .quad compat_sys_move_pages
ia32_syscall_end:
ia32_syscall_end: