From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 18 Jul 2008 12:32:23 +0000 (+0100)
Subject: i386/xen: add proper unwind annotations to xen_sysenter_target
X-Git-Tag: v2.6.27-rc1~955^2~1^19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ddf9b7b3e6660199269e34cfa27148440ddc3bf;p=linux-2.6

i386/xen: add proper unwind annotations to xen_sysenter_target

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 6bc07f0f12..ad5264c29e 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1024,6 +1024,7 @@ 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