From f256948c0132550c62800f9eada9f1444955bb97 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 18 Jul 2008 13:32:23 +0100
Subject: [PATCH] --- yaml --- r: 104394 b: refs/heads/master c:
 2ddf9b7b3e6660199269e34cfa27148440ddc3bf h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_32.S | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e27fe3056a51..52e68d87b5d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95c7c23b06bc92f1772b9c9460845f179ba8c39e
+refs/heads/master: 2ddf9b7b3e6660199269e34cfa27148440ddc3bf
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
index 6bc07f0f1202..ad5264c29e9b 100644
--- a/trunk/arch/x86/kernel/entry_32.S
+++ b/trunk/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