Skip to contentSkip to conversation

x86-64: remove meaningless unwind annotations

PATCH In review Jan Beulich 1 participant 2 messages Mar 12, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86-64: remove meaningless unwind annotations

These got left in needlessly when ret_from_fork got simplified.

---
 arch/x86/kernel/entry_64.S |    2 --
 1 file changed, 2 deletions(-)
arch/x86/kernel/entry_64.S +0 -2
@@ -418,7 +418,6 @@ ENTRY(ret_from_fork)
 
 	GET_THREAD_INFO(%rcx)
 
-	CFI_REMEMBER_STATE
 	RESTORE_REST
 
 	testl $3, CS-ARGOFFSET(%rsp)		# from kernel_thread?
@@ -430,7 +429,6 @@ ENTRY(ret_from_fork)
 	RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET
 	jmp ret_from_sys_call			# go to the SYSRET fastpath
 
-	CFI_RESTORE_STATE
 	CFI_ENDPROC
 END(ret_from_fork)
 
#1 lore raw

[tip:x86/asm] x86: remove leftover unwind annotations

Commit-ID:  9fa7266c2f0cdfcb09eacba2d3624bec7df78641
Gitweb:     http://git.kernel.org/tip/9fa7266c2f0cdfcb09eacba2d3624bec7df78641
Author:     "Jan Beulich" <[email protected]>
AuthorDate: Thu, 12 Mar 2009 10:34:45 +0000
Commit:     Ingo Molnar <[email protected]>
CommitDate: Thu, 12 Mar 2009 11:50:39 +0100

x86: remove leftover unwind annotations

Impact: cleanup

These got left in needlessly when ret_from_fork got simplified.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/entry_64.S |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/x86/kernel/entry_64.S +0 -2
index 7ba4621..54866bb 100644
@@ -416,7 +416,6 @@ ENTRY(ret_from_fork)
 
 	GET_THREAD_INFO(%rcx)
 
-	CFI_REMEMBER_STATE
 	RESTORE_REST
 
 	testl $3, CS-ARGOFFSET(%rsp)		# from kernel_thread?
@@ -428,7 +427,6 @@ ENTRY(ret_from_fork)
 	RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET
 	jmp ret_from_sys_call			# go to the SYSRET fastpath
 
-	CFI_RESTORE_STATE
 	CFI_ENDPROC
 END(ret_from_fork)