From 728ebddb29655e4341934f075b808a2624a3201d Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Thu, 24 Jan 2013 09:27:31 +0000
Subject: [PATCH] --- yaml --- r: 349407 b: refs/heads/master c:
 444723dccc3c855fe88ea138cdec46f30e707b74 h: refs/heads/master i:   349405:
 f0f262ec67dcb1ec3bf22912298e77e8088b58a2   349403:
 0c2cc2bc538ce89d1c9febec3942bda916dd74af   349399:
 59989eddf9a2bae14bb0fd43324dc14f6f0710cf   349391:
 00ad6f98a6a3474af7233f37f566b05fd33cc2a0   349375:
 4619b7ae01762e4c6f84beab5370a21ed261d8d4 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_64.S | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d8775228cb04..4128f9a0c110 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 021ef050fc092d5638e69868d126c18006ea7296
+refs/heads/master: 444723dccc3c855fe88ea138cdec46f30e707b74
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
index 07a7a04529bc..cb3c591339aa 100644
--- a/trunk/arch/x86/kernel/entry_64.S
+++ b/trunk/arch/x86/kernel/entry_64.S
@@ -1781,6 +1781,7 @@ first_nmi:
 	 * Leave room for the "copied" frame
 	 */
 	subq $(5*8), %rsp
+	CFI_ADJUST_CFA_OFFSET 5*8
 
 	/* Copy the stack frame to the Saved frame */
 	.rept 5
@@ -1863,10 +1864,8 @@ end_repeat_nmi:
 nmi_swapgs:
 	SWAPGS_UNSAFE_STACK
 nmi_restore:
-	RESTORE_ALL 8
-
-	/* Pop the extra iret frame */
-	addq $(5*8), %rsp
+	/* Pop the extra iret frame at once */
+	RESTORE_ALL 6*8
 
 	/* Clear the NMI executing stack variable */
 	movq $0, 5*8(%rsp)