From 6e8843417ba324fb7b5325c2726d2f4b22092fc5 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Fri, 7 Apr 2006 19:49:12 +0200 Subject: [PATCH] --- yaml --- r: 25319 b: refs/heads/master c: 805e8c03c9ea9bdb402a36341e02ec24825d5417 h: refs/heads/master i: 25317: 97f13d78759a871f1edeaba55ab298547b6a4f17 25315: 555354e1448f17bac2c3fb33e935efb7b020fa37 25311: 8a1bbad8356d73d4cc6dbcffbc7cfb5f03be9da5 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/entry.S | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index c3ffbbf5f0a0..27dcb148e8b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 903fcc608e9f531749024172277dc2fd15d5a587 +refs/heads/master: 805e8c03c9ea9bdb402a36341e02ec24825d5417 diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S index 8538bfea30e6..10ec27b607f1 100644 --- a/trunk/arch/x86_64/kernel/entry.S +++ b/trunk/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