---

yaml --- r: 136923 b: refs/heads/master c: bda3a89 h: refs/heads/master i: 136921: db3c124 136919: 07ce6c8 v: v3
git-mirror · Feb 23, 2009 · 1e4f2ba · 1e4f2ba
1 parent d2e05e2
commit 1e4f2ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2366c298b5afe52e635afd5604b69ce9fd4471fc
+refs/heads/master: bda3a89745d7bb88d3e735046c0cdc3d0eb2ac24
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
@@ -1359,7 +1359,7 @@ nmi_espfix_stack:
 	CFI_ADJUST_CFA_OFFSET 4
 	pushl %esp
 	CFI_ADJUST_CFA_OFFSET 4
-	addw $4, (%esp)
+	addl $4, (%esp)
 	/* copy the iret frame of 12 bytes */
 	.rept 3
 	pushl 16(%esp)