diff options
| author | Andi Kleen <ak@suse.de> | 2006-04-07 19:49:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-09 11:53:16 -0700 |
| commit | 805e8c03c9ea9bdb402a36341e02ec24825d5417 (patch) | |
| tree | c7047d0e3b2e72a7885bfce80369c25c89936821 /arch | |
| parent | 903fcc608e9f531749024172277dc2fd15d5a587 (diff) | |
| download | linux-stable-805e8c03c9ea9bdb402a36341e02ec24825d5417.tar.gz linux-stable-805e8c03c9ea9bdb402a36341e02ec24825d5417.tar.bz2 linux-stable-805e8c03c9ea9bdb402a36341e02ec24825d5417.zip | |
[PATCH] x86_64: Clean up execve path
Just call IRET always, no need for any special cases.
Needed for the next bug fix.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 8538bfea30e6..10ec27b607f1 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S @@ -408,25 +408,9 @@ ENTRY(stub_execve) CFI_ADJUST_CFA_OFFSET -8 CFI_REGISTER rip, r11 SAVE_REST - movq %r11, %r15 - CFI_REGISTER rip, r15 FIXUP_TOP_OF_STACK %r11 call sys_execve - GET_THREAD_INFO(%rcx) - bt $TIF_IA32,threadinfo_flags(%rcx) - CFI_REMEMBER_STATE - jc exec_32bit RESTORE_TOP_OF_STACK %r11 - movq %r15, %r11 - CFI_REGISTER rip, r11 - RESTORE_REST - pushq %r11 - CFI_ADJUST_CFA_OFFSET 8 - CFI_REL_OFFSET rip, 0 - ret - -exec_32bit: - CFI_RESTORE_STATE movq %rax,RAX(%rsp) RESTORE_REST jmp int_ret_from_sys_call |