Skip to contentSkip to conversation

i386/xen: add proper unwind annotations to xen_sysenter_target

PATCH In review Jan Beulich 2 participants 2 messages Jul 18, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386/xen: add proper unwind annotations to xen_sysenter_target

Cc Jeremy Fitzhardinge <[email protected]>
---
 arch/x86/kernel/entry_32.S |    2 ++
 1 file changed, 2 insertions(+)
arch/x86/kernel/entry_32.S +2 -0
@@ -1023,7 +1023,9 @@ ENDPROC(kernel_thread_helper)
 ENTRY(xen_sysenter_target)
 	RING0_INT_FRAME
 	addl $5*4, %esp		/* remove xen-provided frame */
+	CFI_ADJUST_CFA_OFFSET -5*4
 	jmp sysenter_past_esp
+	CFI_ENDPROC
 
 ENTRY(xen_hypervisor_callback)
 	CFI_STARTPROC
#1 lore raw
Quoted 11 lines · Jan Beulich
Cc Jeremy Fitzhardinge <[email protected]>
---
 arch/x86/kernel/entry_32.S |    2 ++
 1 file changed, 2 insertions(+)

arch/x86/kernel/entry_32.S ENDPROC(kernel_thread_helper) · line 1031

Quoted 9 lines
arch/x86/kernel/entry_32.S +2 -0
@@ -1023,7 +1023,9 @@ ENDPROC(kernel_thread_helper)
 ENTRY(xen_sysenter_target)
 	RING0_INT_FRAME
 	addl $5*4, %esp		/* remove xen-provided frame */
+	CFI_ADJUST_CFA_OFFSET -5*4
 	jmp sysenter_past_esp
+	CFI_ENDPROC
 
 ENTRY(xen_hypervisor_callback)
 	CFI_STARTPROC

Manually applied to x86/xen; CFI_ENDPROC was already in the tree...

-hpa