---

yaml --- r: 349407 b: refs/heads/master c: 444723d h: refs/heads/master i: 349405: f0f262e 349403: 0c2cc2b 349399: 59989ed 349391: 00ad6f9 349375: 4619b7a v: v3
git-mirror · Jan 24, 2013 · 728ebdd · 728ebdd
1 parent 1b20f18
commit 728ebdd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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)